bc7a77f14d
Merge branch 'MDL-39661-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-13 08:54:23 +08:00
8772689453
MDL-43590 Merge English strings from the en_fix language pack
2014-01-09 01:11:59 +01:00
2424069da2
MDL-39661 blocks: Removed notice when moving a block
2014-01-06 12:44:23 +01:00
786f04f485
Merge branch 'MDL-43142_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE
2013-12-03 23:41:24 +01:00
e6175024e6
MDL-43033 cache: added a warning icon for mappings
...
We now show a warning icon with an explanatory alt if the user
has mapped a store as a mode default that doesn't not fulfill the
requirements of every known definition.
2013-12-02 09:29:44 +13:00
d0e29366de
MDL-43142 mnet: fixed typo in variable passed to get_string
2013-11-29 14:15:24 -08:00
1e9c117f50
Merge branch 'wip-MDL-43008-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE
2013-11-26 16:59:04 +08:00
55b02e02e6
MDL-43008 calendar: Allow calendar plugins to display setting pages.
2013-11-26 15:50:31 +08:00
fdbd1d7a9d
MDL-42925 course: Changed help string for course format selection
2013-11-25 15:44:06 +08:00
c7232a325a
MDL-42850 administration: Updated bulk user upload errors to be more descriptive.
2013-11-19 14:20:32 +13:00
ea7aa014f9
MDL-42860 improve db session help string
2013-11-13 10:54:15 +01:00
aa861f6297
MDL-42832 course: management viewmode string improvements
2013-11-12 15:32:59 +08:00
b544b09636
Merge branch 'MDL-42824-master-int' of git://github.com/FMCorz/moodle
2013-11-12 15:00:57 +11:00
6f4a169d8e
Merge branch 'MDL-42215_lang' of https://github.com/andyjdavis/moodle
2013-11-12 11:34:39 +08:00
eb59e0ed3b
MDL-42824 backup: Typo in description of setting backup_general_questionbank
2013-11-12 08:51:44 +08:00
cd96b7d3e4
MDL-41392 course: management checkbox accessibility improvement
2013-11-11 17:10:14 +08:00
d0647301a0
MDL-41392 course: management accessibility tweaking
2013-11-11 17:09:44 +08:00
d5c0f0453c
Merge branch 'MDL-39923_master' of https://github.com/totara/openbadges
...
Conflicts:
version.php
2013-11-11 10:17:07 +08:00
f5d17c14ea
MDL-39923 badges: Send badge messages through internal messaging system
2013-11-07 14:49:27 +13:00
02c6bd358f
Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle
...
Conflicts:
lang/en/moodle.php
2013-11-07 09:34:31 +08:00
3749c94627
MDL-42714 Backup: For tgz packer, handle missing zlib extension
2013-11-06 12:34:46 +00:00
951b414b65
Merge branch 'MDL-40975-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-11-06 13:06:01 +08:00
d881e0bb84
MDL-40975 Course: Remove groupmode when forced at course level
2013-11-06 11:40:53 +08:00
a83d83e42b
MDL-40975 Course: Change which actions are in the menu and which are outside it
2013-11-06 11:40:49 +08:00
5a25566060
MDL-42728 Merge English strings from the en_fix language pack
2013-11-05 23:41:44 +01:00
e69a0251dc
MDL-42710 course: management cat sorting perfecting taking place
2013-11-05 21:52:45 +08:00
38a15200b9
MDL-42629 course: management peer-review alterations
...
* Added confirmation when bulk moving courses.
* Increased min-width of category course count to allow for 3 digits.
* Fixed sub-category => subcategory
* Renamed console JS vars to managementconsole
* Added typeof operator
* Renamed oldcatcourses and newcatcourses as suggested
* Added a span around course count and interacted with that.
* Fixed icon sizing
* Fixed management behat tests
* Fixed wrapping of strings in menus
2013-11-05 13:57:01 +08:00
c7a2291f8b
MDL-42629 course: management resorting improvements
2013-11-05 09:49:20 +08:00
d3670843eb
MDL-42629 course: changed new course to create new course
2013-11-05 09:49:14 +08:00
83886a49a0
MDL-42629 course: changed sub category to subcategory
2013-11-05 09:49:13 +08:00
017518d4f8
MDL-42629 course: fixed up create category management actions
2013-11-05 09:49:13 +08:00
115e5f052f
MDL-42629 course: renamed re-sort to sort
2013-11-05 09:49:13 +08:00
5a47ef3827
MDL-42215 lang: improved the help string for fullnamedisplay
2013-11-03 09:12:36 +08:00
e9a20b4703
Merge branch 'wip-MDL-28463-master' of git://github.com/marinaglancy/moodle
...
Conflicts:
version.php
2013-11-01 21:31:57 +08:00
b4dba228a7
MDL-28463 conditionlib: use MUC for caching grades, reset when grades are changed
2013-11-01 16:48:50 +11:00
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
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
4daa024fd4
Merge branch 'MDL-22669-master' of git://github.com/FMCorz/moodle
2013-10-28 16:31:17 +08:00
be99db5b96
MDL-22669 course: Display section number for orphaned activities
2013-10-28 14:44:08 +08:00
3a33578926
Merge branch 'wip-mdl-30812' of git://github.com/rajeshtaneja/moodle
2013-10-28 12:11:34 +08:00
012b0472c5
Merge branch '42299-26' of git://github.com/samhemelryk/moodle
...
Conflicts:
version.php
2013-10-24 15:47:48 +08:00
616e57d926
Merge branch 'MDL-40045_master' of https://github.com/markn86/moodle
2013-10-22 12:11:45 +02:00
62b6135c38
MDL-34612 Restore: Gracefully handle empty section title while restoring
2013-10-22 09:47:42 +08:00
f2f694f399
MDL-40045 user: replaced add_to_log call when the user list is viewed with an event
2013-10-21 11:53:31 +08:00
c76318d338
MDL-40045 user: replaced add_to_log call when a user profile is viewed with an event
2013-10-21 11:53:31 +08:00
70f210c04f
MDL-42201 backup: introduced new automatic backup state
2013-10-21 11:51:12 +08:00
df460b5a23
MDL-42299 course: management category expansion improvements
2013-10-17 12:11:31 +13:00
b2858b916a
MDL-42148 new overview of 3rd party libraries
...
Includes:
* each plugin has own thirdpartylibs.xml file
* added missing libraries
* fixed existing library infos
* new Site administration / Development / Third party libraries page
2013-10-16 14:48:29 +08:00
9860e57104
MDL-42258 course management: improved role assignments string
2013-10-11 11:43:51 +13:00
370058d8fb
Merge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle
...
Conflicts:
lib/upgrade.txt
2013-10-10 10:49:11 +08:00
Dan Poltawski