Eloy Lafuente (stronk7)
620e1e3787
Merge branch 'w27_MDL-39088_m26_uninstall' of https://github.com/skodak/moodle
2013-07-03 11:34:55 +02:00
Rajesh Taneja
33564ffb42
MDL-40400 Gradebook: get_toggles_html and print_toggle cannot be used anymore
2013-07-03 17:06:59 +08:00
Frederic Massart
8853cd202c
MDL-40369 theme: Removing old gif icons with PNG/SVG versions
2013-07-03 16:58:18 +08:00
Frederic Massart
677541ebe7
MDL-40369 theme: MyMobile does not override deprecated icons
2013-07-03 16:47:36 +08:00
Frederic Massart
7125ef4b2c
MDL-40369 theme: Afterburner does not override deprecated icons
2013-07-03 16:47:36 +08:00
Frederic Massart
36f5dd3943
MDL-40369 theme: Remove deprecated icons
2013-07-03 16:47:36 +08:00
Frederic Massart
a8dd22a7d7
MDL-40369 theme: Fix core using deprecated icons
2013-07-03 16:47:35 +08:00
Frederic Massart
0193dd1c32
MDL-38314 repository: Improving performance of upgrade script
2013-07-03 16:24:19 +08:00
Damyon Wiese
13e82f1c67
MDL-40472: Clean all codechecker warnings on mod_assign
2013-07-03 16:00:43 +08:00
Petr Škoda
02a541ee8e
MDL-39088 fix incorrect module count SQL
2013-07-03 09:40:07 +02:00
Frederic Massart
65ef774544
MDL-38314 repository: Unit Tests for delete_all_for_context()
2013-07-03 15:26:20 +08:00
Frederic Massart
d802435e00
MDL-38314 repository: Delete repository instances on context deletion
2013-07-03 15:26:20 +08:00
Frederic Massart
4aa4d88da8
MDL-38314 repository: Remove orphan repository instances
2013-07-03 15:26:20 +08:00
Nadav Kavalerchik
8137e0496e
MDL-37065 - Change get_string('status') token in assignment submissions page to a different token (for translation flexibility)
...
AMOS BEGIN
CPY [status,core],[status,mod_assign]
AMOS END
2013-07-03 14:59:52 +08:00
Yuliya Bozhko
19a9f2eada
MDL-39986 badges: Show badge navigation to users with awardbadge capability
...
Also fixes an arror when a user with this capability tries to award a badge,
but their role is not among the criteria set up for a badge
2013-07-03 13:13:55 +08:00
Damyon Wiese
4787014c56
MDL-39813 recompile less for bootstrapbase
2013-07-03 11:38:21 +08:00
Damyon Wiese
24e13d4283
Merge branch 'MDL-39813_login' of git://github.com/andyjdavis/moodle
2013-07-03 11:35:53 +08:00
Andrew Davis
29a24edd8b
MDL-39813 added some white space above the cookie message
2013-07-03 11:07:35 +08:00
Damyon Wiese
74ed095606
MDL-39558 badges: Prevent backup of badges without user information
2013-07-03 10:52:50 +08:00
Yuliya Bozhko
bd0d2bdcc9
MDL-39558 badges: Add backup/restore of manually awarded badges
2013-07-03 09:36:45 +08:00
Yuliya Bozhko
2832093f53
MDL-39558 badges: Add backup/restore to course badges
2013-07-03 09:35:06 +08:00
Eloy Lafuente (stronk7)
cfe8b6df33
Merge branch 'MDL-40275-m' of git://github.com/micaherne/moodle
2013-07-02 21:52:17 +02:00
Eloy Lafuente (stronk7)
1b80060ff0
MDL-35009 Normalize deprecation (also MDL-34472)
...
- Use same deprecation phrases style.
- Use same upgrade.txt phrases style.
- Add unit test covering the deprecation.
See the issue for some more rationale / comments.
2013-07-02 21:40:16 +02:00
Eloy Lafuente (stronk7)
7b2ca65574
Merge branch 'wip-mdl-35009' of git://github.com/rajeshtaneja/moodle
...
Conflicts:
lib/accesslib.php
lib/deprecatedlib.php
lib/upgrade.txt
2013-07-02 21:22:30 +02:00
Eloy Lafuente (stronk7)
aefc66dd35
Merge branch 'MDL-40376-m' of git://github.com/andrewnicols/moodle
2013-07-02 21:11:49 +02:00
Eloy Lafuente (stronk7)
f8c54a7469
MDL-37516 Translate fieldnames on output only.
...
This reverts a change performed by the previous commit where user
fieldnames were being translated (and cached) when fetched,
causing the information to remain static later, not responding
to language switches (and perhaps leading to other problems if those
structures are used lated for DB / $USER comparisons.
With the commit, the translation happens on output, so no
potential interferences will happen and, also, the information
changes dynamically on lang switching.
2013-07-02 20:39:05 +02:00
sam marshall
6316bfa0c7
MDL-37516 Conditional activities: user field condition display fixes
2013-07-02 20:00:17 +02:00
Eloy Lafuente (stronk7)
c946f60b0d
Merge branch 'MDL-40314_M26' of git://github.com/lazydaisy/moodle
2013-07-02 19:41:44 +02:00
Eloy Lafuente (stronk7)
1203222a3c
Merge branch 'MDL-40246_master' of git://github.com/dmonllao/moodle
2013-07-02 14:27:34 +02:00
Eloy Lafuente (stronk7)
3c2e7a0e7c
Merge branch 'MDL-34472-master' of git://github.com/ankitagarwal/moodle
...
Conflicts:
lib/upgrade.txt
2013-07-02 14:09:11 +02:00
Eloy Lafuente (stronk7)
8b180f2317
Merge branch 'MDL-40439-en_fix' of git://github.com/mudrd8mz/moodle
2013-07-02 13:47:09 +02:00
Helen Foster
77fc81f3ee
MDL-40439 Merge English strings from the en_fix language pack
2013-07-02 11:42:10 +02:00
Dan Poltawski
6f3c780f3b
Merge branch 'w27_MDL-40337_m26_rolescleanup' of https://github.com/skodak/moodle
2013-07-02 17:09:38 +08:00
Dan Poltawski
1e031a4616
Merge branch 'MDL-40389' of git://github.com/stronk7/moodle
2013-07-02 15:52:58 +08:00
Damyon Wiese
f48f4827d1
Merge branch 'w27_MDL-40299_m26_textlib' of https://github.com/skodak/moodle
2013-07-02 15:23:38 +08:00
Tim Hunt
38c3492038
MDL-40434 calculatedmulti multiple-response questions not randomised
2013-07-02 08:21:42 +01:00
Dan Poltawski
fe6d32fcb3
Merge branch 'MDL-40282' of github.com:colchambers/moodle
2013-07-02 15:15:04 +08:00
Ankit Agarwal
bfb99cc619
MDL-34472 phpunit: Make sure a debugging is thrown when get_context_instance() is called
2013-07-02 15:09:01 +08:00
Rajesh Taneja
38efca2315
MDL-40127 Enrolments: Updated version and update.txt
2013-07-02 14:35:35 +08:00
Rajesh Taneja
94b98dae64
MDL-40127 Enrolments: Added unit test
2013-07-02 14:35:34 +08:00
Rajesh Taneja
cc1b501595
MDL-40127 Enrolments: Added status to instance info and removed displaying of enrolment form with notice
...
get_enrol_info will return status of enrolment instance, to notify webservice if enrolment is possible or not
If enrolment is not possible then don't show enrolment form
show_enrolme_link will use can_self_enrol to varify if enrolment link should be shown or not.
2013-07-02 14:35:33 +08:00
Rajesh Taneja
85d1c53af4
MDL-40127 Enrolments: Abstracted self_enrolment code so as to be used by webservices
2013-07-02 14:35:33 +08:00
Damyon Wiese
1fd351c207
Merge branch 'wip-MDL-40353-master' of git://github.com/marinaglancy/moodle
2013-07-02 14:28:46 +08:00
Dan Poltawski
6e4de30636
Merge branch 'MDL-40039-master' of git://github.com/ankitagarwal/moodle
2013-07-02 14:27:49 +08:00
Dan Poltawski
20cea2c57f
Merge branch 'MDL-40297' of git://github.com/stronk7/moodle
2013-07-02 13:43:40 +08:00
Andreas Grabs
09c2ec4303
MDL-39570 mod_feedback - Missing privilege check
2013-07-02 13:37:10 +08:00
Dan Poltawski
b25cd1f3d5
Merge branch 'w27_MDL-40399_m26_msarrayshift' of https://github.com/skodak/moodle
2013-07-02 13:34:09 +08:00
Petr Škoda
61d96926cf
MDL-39088 fix admin/localplugins.php uninstall url
2013-07-02 07:24:33 +02:00
Dan Marsden
612fdeb24e
MDL-39628 Chat: check mod/chat:chat capability when using daemon.
...
Thanks to Francois Gauthier for report/fix.
2013-07-02 12:20:29 +08:00
Damyon Wiese
021beab522
MDL-26943 Add db/subplugins.php to the local plugin readme.txt
2013-07-02 12:02:33 +08:00