mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-06 08:49:53 +01:00
Code Issues Projects Releases Wiki Activity
64,761 Commits 36 Branches 523 Tags
Commit Graph

3971 Commits

Author SHA1 Message Date
Sam Hemelryk
ae3fd8eb76 MDL-42452 block: action menu is now constrained to the block container 2013-11-03 16:42:40 +08:00
Rajesh Taneja
3b732cd6cc MDL-42492 course: Show option to move category to top level 
added behat to test move category
 2013-11-01 15:53:38 +11:00
Marina Glancy
d2941e8808 Merge branch 'MDL-42471-master' of git://github.com/andrewnicols/moodle 2013-11-01 09:00:05 +08:00
Sam Hemelryk
cda49969c3 MDL-42300 course: improved category re-sort controls. 
* The top action now works on top level categories and has
  a better title.
* Each category has its own resort actions now.
 2013-11-01 08:57:39 +08:00
Dan Poltawski
d147e833c0 Merge branch 'wip-MDL-42441-master' of git://github.com/marinaglancy/moodle 2013-10-29 17:28:25 +08:00
Marina Glancy
0ae13c0f63 MDL-42441 modules: Remove unnecessary code when creating the module in D&D 
property groupmodelink is not used at all and groupmode is already processed
properly in core functions (respecting groupmodeforce property in course).
This looks like old code that has not been updated. It's a shame we
duplicate module creation login in draganddrop library
 2013-10-29 20:12:51 +11:00
Dan Poltawski
c966d2e8c8 Merge branch 'MDL-42528' of https://github.com/merrill-oakland/moodle 2013-10-29 15:03:52 +08:00
Dan Poltawski
7d3cdcc90d Merge branch 'wip-mdl-42557' of https://github.com/rajeshtaneja/moodle 2013-10-29 13:16:44 +08:00
Dan Poltawski
4daa024fd4 Merge branch 'MDL-22669-master' of git://github.com/FMCorz/moodle 2013-10-28 16:31:17 +08:00
Rajesh Taneja
0d22c24829 MDL-42557 Events: added idnumber to course_deleted event data 2013-10-28 16:16:25 +08:00
Dan Poltawski
b1a6c9dc52 Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	login/change_password.php
 2013-10-28 15:37:05 +08:00
Dan Poltawski
10ac20830b Merge branch 'wip-mdl-42283' of git://github.com/rajeshtaneja/moodle 2013-10-28 14:53:21 +08:00
Frederic Massart
be99db5b96 MDL-22669 course: Display section number for orphaned activities 2013-10-28 14:44:08 +08:00
Andrew Nicols
6a2da367aa MDL-42471 JavaScript: Adding missing dependency to toolbox 2013-10-25 13:40:40 +08:00
Eric Merrill
ac1a29755e MDL-42528 Activity Completion: DnD upload should obey default setting 
Make activities created by drad and drop obey Default completion
tracking setting.
 2013-10-24 17:50:08 -04:00
Dan Poltawski
012b0472c5 Merge branch '42299-26' of git://github.com/samhemelryk/moodle 
Conflicts:
	version.php
 2013-10-24 15:47:48 +08:00
Marina Glancy
33c4c3a363 Merge branch 'MDL-41252-master' of git://github.com/mouneyrac/moodle 2013-10-24 14:15:05 +11:00
David Monllao
2a9275c4c5 MDL-40976 behat: Updating tests according to new behaviour 
We only open the actions menu when is collapsed.
 2013-10-23 16:19:33 +08:00
Rajesh Taneja
3f038d6d97 MDL-42283 Behat: Automated MDLQA-1777 
MDLQA-1777: A teacher can set grade conditions to restrict availability of a section
 2013-10-23 15:57:53 +08:00
Marina Glancy
90eb4ddd9a Merge branch '42246-26' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-10-23 17:22:28 +11:00
Dan Poltawski
8c8a844f2b Merge branch '42277-26' of git://github.com/samhemelryk/moodle 2013-10-23 13:18:45 +08:00
Marina Glancy
4f10bc6bb0 Merge branch '42301-26' of git://github.com/samhemelryk/moodle 2013-10-23 13:51:00 +11:00
Marina Glancy
f9c86035c9 Merge branch '42316-26' of git://github.com/samhemelryk/moodle 2013-10-23 11:05:59 +11:00
Dan Poltawski
181b0b3c3e Merge branch 'MDL-42117-master' of git://github.com/andrewnicols/moodle 2013-10-22 12:11:42 +02:00
Andrew Nicols
d5367fb566 MDL-42117 JavaScript: Ensure that new activities are fully set up 
We don't need to set up anything specifically for toolboxes any more, but
other third-party JS may require additional setup following new module
creation.
 2013-10-22 11:26:44 +08:00
Andrew Nicols
b676db838b MDL-42117 JavaScript: Don't rely on node data for course toolboxes 
The YUI versions of getData and setData do not store the data in the DOM,
but in an instance of YUI. If you make modifications in one instance, but
apply them in another, then the data values are not accessible between
these two instances.

Additionally, there's no benefit to storing the instances on
initialisation - if anything, it increases the load overhead.

This change moves toolboxes to calculating their ancestors on click in the
same way it was done in the initialiser.
 2013-10-22 11:26:36 +08:00
Petr Škoda
d5814f4e22 MDL-41811 simplify the admin tree detection logic and fix navigation in multiple areas 2013-10-21 14:17:55 +08:00
Rajesh Taneja
bafcd3f17a MDL-41811 navigation: Load site admin navigation 
Go to notification page before following links within site admin
navigation, ensuring site admin navigation is loaded

With no js, test should follow site admin link and not expand it.
 2013-10-21 14:17:55 +08:00
Rajesh Taneja
b92adf24a4 MDL-41811 navigation: Fixed navigation issues on pages 
Few admin pages don't add navigation node and hence they should
not show site admin
 2013-10-21 14:17:54 +08:00
Petr Škoda
e56c107da8 MDL-41811 tweak custom admin pages to force loading of admin tree 2013-10-21 14:17:53 +08:00
Dan Poltawski
9c5ab08e5a Merge branch 'MDL-34209-master' of git://github.com/andrewnicols/moodle 2013-10-21 13:58:14 +08:00
Sam Hemelryk
df460b5a23 MDL-42299 course: management category expansion improvements 2013-10-17 12:11:31 +13:00
Sam Hemelryk
d5de874727 MDL-42299 course: management interface remember categories expanded by AJAX 
Categories that have been expanded using AJAX are now remember and
expanded again autoamtically when something triggers a page refresh.
 2013-10-17 08:41:12 +13:00
Sam Hemelryk
3f08254ff8 MDL-42277 course: fixed missing set context 2013-10-17 08:41:07 +13:00
Sam Hemelryk
962885e80c MDL-42316 course: moved require_login up the script 2013-10-17 08:40:55 +13:00
Sam Hemelryk
3b681e6cf8 MDL-42246 course: improved highlighting of bulk actions 2013-10-17 08:40:44 +13:00
Sam Hemelryk
4d4f516da6 MDL-42301 course: listings now show a delete icon 2013-10-17 08:39:12 +13:00
Eloy Lafuente (stronk7)
059d7bd275 Merge branch 'MDL-42380-master' of git://github.com/damyon/moodle 2013-10-16 15:19:36 +02:00
Damyon Wiese
6de4beb8dd MDL-42380 Course unit tests: Remove assert causing oracle unit tests to die 2013-10-16 13:20:33 +08:00
Damyon Wiese
2ec214806f Merge branch '42294-26' of git://github.com/samhemelryk/moodle 2013-10-16 11:36:16 +08:00
Eloy Lafuente (stronk7)
11182e2eb1 Merge branch 'w42_MDL-42224_m26_msgredir' of https://github.com/skodak/moodle 2013-10-16 01:23:01 +02:00
Eloy Lafuente (stronk7)
cbef1d9d3f MDL-42302 course: re-shitfering management module. 2013-10-16 00:53:58 +02:00
Sam Hemelryk
b155a17034 MDL-42302 course: fixed bugs while changing visibility 
* No longer uses show which is resvered on MySQL
* Selected category courses are now always returned.
 2013-10-16 08:25:08 +13:00
Sam Hemelryk
af321e0f20 MDL-42294 course: fixed delete script ordering 
Added a behat test for the creation and deletion of a new course.
This should turn up any such errors like this during automated
testing in the future.
 2013-10-16 08:24:56 +13:00
Damyon Wiese
7aeb2cc335 Merge branch '42249-26' of git://github.com/samhemelryk/moodle 2013-10-14 15:12:17 +08:00
Damyon Wiese
36f60b226d Merge branch '42253-26' of git://github.com/samhemelryk/moodle 2013-10-14 13:02:55 +08:00
Petr Škoda
f007e89961 MDL-42224 clean up message and email redirection testing 2013-10-12 13:59:07 +02:00
Damyon Wiese
d61c05ac4a MDL-31830 category management: Fix coding_error when moving 0 courses 2013-10-11 16:06:40 +08:00
Sam Hemelryk
7c033254d4 MDL-42253 course management: fixed course pagination 
If the number of courses === the number per page pagination
was being incorrectly rendered.
Fixed this and added a behat test to confirm it.
 2013-10-11 12:09:23 +13:00
Sam Hemelryk
a8003c0a16 MDL-42249 course: converted all dropdowns to contextmenu icon 2013-10-11 10:49:27 +13:00