mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 23:20:09 +01:00
Code Issues Projects Releases Wiki Activity
69,449 Commits 36 Branches 527 Tags
Commit Graph

12101 Commits

Author SHA1 Message Date
Marina Glancy
e12ffe254e Merge branch 'MDL-46600_import_failed' of git://github.com/andyjdavis/moodle 2014-08-12 15:01:19 +08:00
Dan Poltawski
c7a042bfcf Merge branch 'master_MDL-46524' of https://github.com/greg-or/moodle-mod_assign 2014-08-11 17:06:54 +01:00
Andrew Davis
23a62c47af MDL-46600 core_grades: made it explicit in the error message that a failed grade import means nothing was imported. 2014-08-06 10:58:59 +08:00
Gregory Faller
e4ebf7ef0f MDL-46524: Auto-create groups from existing group or grouping membership 2014-08-06 10:50:14 +09:30
Dan Poltawski
a43be9d8f2 Merge branch 'MDL-46548-master' of git://github.com/damyon/moodle 2014-08-05 19:24:32 +01:00
Damyon Wiese
6c6d05a651 MDL-46548 grades: Add warning to export form when users with no idnumber are excluded. 2014-08-04 16:18:25 +08:00
Andrew Davis
e54e51931d MDL-46175 core_grading: updated grading related strings 2014-08-01 10:28:57 +08:00
Damyon Wiese
cca51baa07 MDL-46548 grades: Add support for simplified one-step exports and update txt exporter 
This ui change requires changes to the API so I have deprecated the old functions while maintaining
compatibility (if you don't mind lots of debugging).
 2014-07-31 17:00:01 +08:00
Marina Glancy
274dc06881 MDL-34189 cohorts: Allow admin/manager to see all cohorts on one page 2014-07-28 15:02:27 +08:00
Dan Poltawski
65f00f063b Merge branch 'MDL-45847_master' of https://github.com/Syxton/moodle 2014-07-21 12:09:10 +01:00
Sam Hemelryk
6a91c41a49 Merge branch 'wip-MDL-37812-master' of git://github.com/marinaglancy/moodle 2014-07-15 12:07:05 +12:00
Sam Hemelryk
628e818be2 Merge branch 'MDL-45991_master' of https://github.com/Syxton/moodle 2014-07-14 15:19:21 +12:00
Sam Hemelryk
eb5942ea9d Merge branch 'wip-MDL-46247-master' of https://github.com/mackensen/moodle 2014-07-14 11:55:02 +12:00
Syxton
9a4231e993 MDL-45847 resort: Add more course sorting options 
MDL-45847 resort: Add more course sorting options

Add descending sort options and course timecreated sort options.
Includes behat and unit test changes.
 2014-07-10 16:15:26 -04:00
Syxton
55c9a15041 MDL-45991 groups: Auto-create ignore grouped users 
MDL-45991 groups: Auto-create groups with ungrouped users only

When using auto-create groups, sometimes it is needed to only create
groups with users that are not already inside a course group.  This
patch creates a checkbox that will ignore users that are in already
existing groups.  It alters the groups_get_potential_members function so
that the eligible users are retrieved entirely though sql.
 2014-07-10 15:44:21 -04:00
Dan Poltawski
59ba5a5952 Merge branch 'MDL-45599-master-addons' of git://github.com/mudrd8mz/moodle 2014-07-08 15:31:50 +01:00
Dan Poltawski
4c8fab291b Merge branch 'MDL-46231-master-en_fix' of git://github.com/mudrd8mz/moodle 2014-07-08 08:32:32 +01:00
Marina Glancy
747dac69f9 MDL-37812 user: added defaults for user preferences 2014-07-08 12:35:44 +08:00
Sam Hemelryk
bac04a65bb Merge branch 'm28_MDL-46144' of https://github.com/totara/moodle 2014-07-08 13:10:30 +12:00
Sam Hemelryk
03ecddb440 MDL-45678 cache: renamed new cache and better comments 2014-07-08 09:52:41 +12:00
Sam Hemelryk
207891d791 Merge branch 'MDL-45678-006-master' of https://github.com/dbezborodovrp/moodle 2014-07-08 09:42:35 +12:00
Charles Fulton
65d7932ca3 MDL-46247 auth: Add new language for unauthorised external user 2014-07-07 10:16:09 -07:00
Dan Poltawski
a332d6606a MDL-43848 message: remove unused strings 2014-07-07 13:37:11 +08:00
Helen Foster
78231c9cf1 MDL-46231 Merge English strings from the en_fix language pack 2014-07-04 22:32:38 +02:00
David Mudrák
d49db5b2de MDL-45599 Stop using the 'add-on' term 
We now call them all as just 'plugins' for consistency. There where we need to
explicitly distinguish the source of the plugin, we say they are 'additional
plugins' on contrary to 'standards plugins' coming with the core.
 2014-07-04 13:16:53 +02:00
David Mudrák
9313a478e9 MDL-45599 Remove string editingnoncorelangfile from core_admin 
This string mentions 'add-on' and has been greylisted in AMOS since 2.0. The
usage of it was removed in 00b41d.
 2014-07-04 13:16:53 +02:00
Damien Bezborodov
eeb9ee8ebf MDL-45678 assignsubmission_comments: Improve performance for permissions checking 2014-07-04 14:24:31 +09:30
Brian Barnes
afeb71078b MDL-46144 core_calendar: Fixed linking of labels on calendar pages 2014-07-01 13:39:38 +12:00
Eloy Lafuente (stronk7)
85ee901b5e MDL-46045 whitespace fix 2014-06-24 21:50:05 +02:00
Eloy Lafuente (stronk7)
046930cfba Merge branch 'MDL-46045-master' of git://github.com/damyon/moodle 2014-06-24 21:48:30 +02:00
Damyon Wiese
d9640a99ba Merge branch 'MDL-46022-master' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
 2014-06-24 14:10:51 +08:00
Adrian Greeve
06dc1e7f56 MDL-36003 events: Added events for viewing grade reports. 2014-06-23 11:59:35 +08:00
Jetha Chan
328ef3df0e MDL-46022 custom_menu: add support for dividers 2014-06-20 15:53:11 +08:00
Damyon Wiese
a084ac0db4 MDL-46045 Fix php tags (lowercase) everywhere 2014-06-19 11:05:16 +08:00
Eloy Lafuente (stronk7)
d519545a54 Merge branch '45884-28' of https://github.com/samhemelryk/moodle 2014-06-17 00:09:50 +02:00
Marina Glancy
14422ae946 Merge branch 'MDL-43274-master' of git://github.com/xow/moodle 2014-06-16 17:23:53 +08:00
John Okely
bb8d6e1a81 MDL-43274 Course: Remove ability to delete logs on a course during reset 2014-06-16 09:10:05 +08:00
Sam Hemelryk
99f041ebfa MDL-45884 navigation: changed to positive setting phrasing 2014-06-13 10:16:25 +12:00
Sam Hemelryk
aab6438ca1 MDL-45884 navigation: tidied up code and added behat tests 2014-06-13 10:16:25 +12:00
Syxton
4d378e9f70 MDL-45884 navigation: setting that allows sites to collapse My Courses by default 2014-06-13 10:16:25 +12:00
Eloy Lafuente (stronk7)
ea8541d0f9 Merge branch 'm28_MDL-29708_Typo_Extra_Slashes' of https://github.com/scara/moodle 2014-06-11 01:32:24 +02:00
Eloy Lafuente (stronk7)
ffce783fcd Merge branch 'MDL-45579-master' of git://github.com/FMCorz/moodle 2014-06-10 20:56:14 +02:00
Sam Hemelryk
cbd063f4c3 MDL-44711 navigation: improved expandable course calculation 2014-06-09 09:34:05 +12:00
Matteo Scaramuccia
ad3ade7681 MDL-29708 Fixed extra slashes in $string['storedfilenotcreated']. 2014-06-07 09:53:09 +02:00
Marina Glancy
0313897108 Merge branch 'wip-mdl-44839' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/phpunit/bootstrap.php
 2014-06-04 10:07:03 +08:00
Sam Hemelryk
0591c2056d Merge branch 'MDL-44486-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-06-04 09:51:37 +12:00
Rajesh Taneja
1bce3a70d9 MDL-44839 admin: Moved all system executable paths to config 
AMOS BEGIN
 MOV ['gspath','assignfeedback_editpdf'],['pathtogs','admin']
 MOV ['gspath_help','assignfeedback_editpdf'],['pathtogs_help','admin']
AMOS END
 2014-06-03 17:33:49 +08:00
Frederic Massart
624458a940 MDL-45579 group: Prevent duplicate enrolment keys in course groups 2014-06-03 15:38:06 +08:00
Andrew Nicols
0d1d542332 MDL-45635 javascript: Make core dialogue translatable 2014-05-23 16:01:48 +08:00
sam marshall
3f8527aa1e MDL-45550 Conditional availability: Missing lang string for save settings error 2014-05-14 11:47:53 +01:00