moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66582 commits 37 branches 544 tags 1.3 GiB
Commit graph

66582 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
2fabb89456 Merge branch 'MDL-44061-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-03-12 09:08:52 +08:00
Eloy Lafuente (stronk7)
6d8f9d4756 Merge branch 'wip-MDL-32699-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-03-12 00:19:11 +01:00
Sam Hemelryk
559834f786 Merge branch 'MDL-42368-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 2014-03-12 11:57:01 +13:00
Sam Hemelryk
ce05c00453 Merge branch 'MDL-44345-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-03-12 11:21:59 +13:00
David Monllao
0b5ac03e36 MDL-44246 behat: New mod_quiz test when JS is disabled 2014-03-11 17:22:18 +08:00
Dan Poltawski
1c57cd34e6 Merge branch 'MDL-44095_m26' of https://github.com/shashirepo/moodle into MOODLE_26_STABLE 2014-03-11 15:50:42 +08:00
Dan Poltawski
ab9986bf05 Merge branch 'wip-MDL-44337-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-03-11 15:41:51 +08:00
Dan Poltawski
a808f24536 Merge branch 'MDL-44480-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2014-03-11 14:35:40 +08:00
Dan Poltawski
666af83e4e Merge branch 'wip-MDL-42870-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-03-11 11:37:45 +08:00
Dan Poltawski
af80706515 Merge branch 'm26_MDL-44066' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-03-11 11:29:00 +08:00
Sam Hemelryk
509f371389 Merge branch 'wip-MDL-40721-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-03-11 14:22:41 +13:00
Sam Hemelryk
4294de1edf Merge branch 'w11_MDL-44451_m26_addonloc' of https://github.com/skodak/moodle into MOODLE_26_STABLE 2014-03-11 14:18:14 +13:00
Eloy Lafuente (stronk7)
b17149ee38 Merge branch '44547-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-03-11 00:28:47 +01:00
Sam Hemelryk
598bae139d MDL-44547 repository_alfresco: version bump 2014-03-11 12:05:10 +13:00
Sam Hemelryk
5caac6a494 Merge branch 'MDL-44334-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2014-03-11 10:10:28 +13:00
Sam Hemelryk
6b347521e3 Merge branch 'MDL-43721-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE 2014-03-11 08:54:39 +13:00
Sam Hemelryk
2f5288dea0 Merge branch 'wip-MDL-44471-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-03-11 08:46:11 +13:00
Dan Poltawski
f9835ffed0 Merge branch 'MDL-44440_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-03-10 13:45:27 +08:00
David Monllao
d295418ee6 MDL-44440 behat: Changing , for > as a navigation tree nodes separator 
Using greater than as seems a more natural separator
than the comma when separating nodes which have a
hierarchy relation.
 2014-03-10 13:35:12 +08:00
Dan Poltawski
aacc48a7e6 Merge branch 'MDL-43236_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-03-10 12:04:16 +08:00
David Monllao
4e8c18cc86 MDL-43236 behat: Backporting new method to ease backporting future scenarios 2014-03-10 11:45:19 +08:00
Niclas Tollstorff
45ac1dc77b MDL-37733 SCORM: Correct check for force new attempt 2014-03-08 21:23:05 +13:00
Dan Marsden
e75b7988ef MDL-44066 Restore: Restore source field. 
Causes problems when restoring a SCORM pacakge that uses an alias.
 2014-03-08 21:10:13 +13:00
Dan Marsden
34d0ed1cbf MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close. 2014-03-08 21:03:38 +13:00
Eloy Lafuente (stronk7)
ef0ee34df0 Moodle release 2.6.2 2014-03-07 18:51:51 +01:00
David Monllao
d7f1447861 MDL-44440 behat: Refactoring features to use I navigate to 
Replacing multiple "I expand node" steps by the
new "I navigate to". Also fixing few I navigate to
when dealing with non-JS.
 2014-03-07 14:54:11 +08:00
David Monllao
c4934eed77 MDL-44440 behat: Other fixes to make clean work properly 
- Update the step to follow links inside a treeview
  to work also when JS is disabled.
- Make regions accept header and footer.
- Change some locators refering to non-clean compatible
  regions.
- Restricting click to the table row in forum tracking
  because seems to conflict with the navigation bar when
  using narrow window sizes.
 2014-03-07 14:54:11 +08:00
Rajesh Taneja
ca29a8f865 MDL-44440 navigation: Added behat step to navigate from navigation/Admin block 
This step will help navigate to different parts of moodle
using navigation or adminstration block.
 2014-03-07 14:54:11 +08:00
David Monllao
b04af90c33 MDL-44440 behat: Log out compatible with clean 
.navbar needs to be clicked before following
log in or log out links.
 2014-03-07 14:54:11 +08:00
Tim Lock
56e19b54af MDL-44499: Fix PHP warning in upload_manager class 2014-03-07 14:18:41 +10:30
Krister
eec5c76ce1 MDL-42368 Themes: Anomaly breadcrumb fix 
Previously the editing button could become unreachable with small window
sizes.
 2014-03-07 11:37:17 +08:00
Marina Glancy
10bf53490d MDL-42870 completion: show failed activities as incompleted 2014-03-07 10:22:56 +08:00
Marina Glancy
a2ae0a7643 MDL-44471 Revert "MDL-42238 mod_wiki: Alternate name sql update to wiki_print_recent_activity" 
This reverts commit 6d3d9bd927.
 2014-03-07 10:00:51 +08:00
Marina Glancy
417f7b6ecd MDL-44337 glossary: behat test for glossary categories 2014-03-07 10:00:27 +08:00
Marina Glancy
cdd3ca573a MDL-40721 wiki: missing page->set_url() when restoring wiki 2014-03-07 09:58:23 +08:00
Marina Glancy
b7c751a60c MDL-32699 wiki: only edit capability is required to restore wiki revision 2014-03-07 09:58:05 +08:00
Eloy Lafuente (stronk7)
7330bdebff weekly release 2.6.1+ 2014-03-06 22:17:22 +01:00
Eloy Lafuente (stronk7)
3fb5bd96e8 Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE 2014-03-06 22:17:16 +01:00
Andrew Nicols
2e29720f21 MDL-44480 Javascript: Correct dialogue ID generation 2014-03-06 17:05:45 +08:00
Damyon Wiese
0a0c276e28 MDL-43721 Assign + groups: Improve performance of assign grading table 
Add a function to the groups lib to filter a list of users down
to the ones who can see the module. Required because calling
groups_course_module_visible() for a list of users is too slow
and we shouldn't spread group logic outside of grouplib.php.

Using it in the assign grading table reduces DB queries from 6198/1 to 256/3.

This is 12secs down to 2.5secs.
 2014-03-06 15:51:22 +08:00
Damyon Wiese
3ff7c4e389 MDL-43721 Assign: Static cache for plugin is_enabled and is_visible because they get used alot 2014-03-06 15:51:22 +08:00
Yuliya Bozhko
28c8ac2c4a MDL-44140 badges: Prevent non-owners to change visibility of issued badges 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2014-03-06 14:37:03 +08:00
Damyon Wiese
b9d8d54be2 Merge branch 'wip-MDL-44403-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-03-06 09:22:13 +08:00
Dan Poltawski
e5636247a1 Revert "MDL-43852 Filters Fixed naked-OR conditions." 
While the patch worked as intended, we discovered some other concerns
about use of this setting in testing.

This reverts commit edf55404ff.
 2014-03-06 09:05:27 +08:00
Eloy Lafuente (stronk7)
728ece64e4 Merge branch 'MDL-44425-en_fix_26' of git://github.com/mudrd8mz/moodle into MOODLE_26_STABLE 2014-03-06 00:36:27 +01:00
Helen Foster
eecdbbf315 MDL-44425 Merge English strings from the en_fix language pack 2014-03-05 13:35:06 +01:00
Frederic Massart
76170febcc MDL-44345 repository_youtube: Endless loop when reaching last results 2014-03-05 16:58:44 +08:00
Andrew Nicols
2bc980a970 MDL-44061 Ajax: Log whitespace issues to the server error log 2014-03-05 16:34:57 +08:00
Petr Škoda
8f85cea647 MDL-44451 fix plugin_misplaced_exception exception 2014-03-05 16:34:49 +08:00
Damyon Wiese
6b1e9b0cd4 Merge branch 'MDL-43635-m26' of https://github.com/brentboghosian/moodle2 into MOODLE_26_STABLE 2014-03-05 14:51:18 +08:00