Aparup Banerjee
900d5fd61c
MDL-30243 theme - whitespace fixes to afterburner
2011-11-28 14:47:15 +08:00
Aparup Banerjee
00347b3c3c
Merge branch 'MDL-30243' of git://github.com/lazydaisy/moodle
2011-11-28 14:33:57 +08:00
Sam Hemelryk
ac386aa925
Merge branch 'w48_MDL-30448_m22_urlpar' of git://github.com/skodak/moodle
2011-11-28 18:54:49 +13:00
Sam Hemelryk
beb684ba11
Merge branch 'w48_MDL-30457_m22_deluserspictures' of git://github.com/skodak/moodle
2011-11-28 18:21:39 +13:00
Sam Hemelryk
5c0b8ea3f1
Merge branch 'w48_MDL-30467_m22_delusers' of git://github.com/skodak/moodle
2011-11-28 18:13:27 +13:00
Aparup Banerjee
86b3dd264e
Merge branch 'MDL-30460-master' of git://github.com/ankitagarwal/moodle
2011-11-28 11:43:03 +08:00
Eloy Lafuente (stronk7)
1ff31a54a2
Merge branch 'dropbox-api-bump-for-master' of git://git.luns.net.uk/moodle
2011-11-28 00:08:31 +01:00
Petr Skoda
ee2592346f
MDL-30448 fix url param problems
2011-11-26 13:39:22 +01:00
Petr Skoda
8e470797e3
MDL-30467 notify devs deleted users do not have context
2011-11-26 09:17:02 +01:00
Petr Skoda
5bca744cad
MDL-30467 skip deleted users during pix upgrade
2011-11-26 09:17:02 +01:00
Petr Skoda
368f5b7b4c
MDL-30467 do profiles in tags for deleted users
2011-11-26 09:16:51 +01:00
Petr Skoda
d05e39b0d9
MDL-30467 no system profile for deleted users
2011-11-26 09:16:27 +01:00
Petr Skoda
589071ba34
MDL-30467 no course profile for deleted users
2011-11-26 09:16:08 +01:00
Petr Skoda
03636668d4
MDL-30457 do not show pictures of deleted users
...
Since 2.2 deleted users do not have contexts.
2011-11-26 08:42:36 +01:00
Dan Poltawski
4b05a49bcb
MDL-29960 repository/dropbox - Fix obvious incorrect url
2011-11-25 10:13:29 +00:00
Eloy Lafuente (stronk7)
1de9151c6f
on-demand release 2.2beta+
2011-11-25 11:11:33 +01:00
Eloy Lafuente (stronk7)
a22e233cbb
Merge branch 'install_master' of git://github.com/amosbot/moodle
2011-11-25 11:05:27 +01:00
Dan Poltawski
6381177b9f
MDL-29960 repository/dropbox - remove unsused code
...
This function calls an API request which may be changed from the
version 0 of the API
2011-11-25 09:59:01 +00:00
Dan Poltawski
c745d1e80e
MDL-29960 repository/dropbox - update to use 1.0 API version
2011-11-25 09:59:01 +00:00
Ankit Kumar Agarwal
4021f5f986
MDL-30460 Wiki making file extension case-insensitive
2011-11-25 14:40:09 +05:30
Aparup Banerjee
98377ed578
Merge branch 'MDL-30428-master-1' of git://git.luns.net.uk/moodle
2011-11-25 11:59:10 +08:00
Eloy Lafuente (stronk7)
66d8f36b9e
Merge branch 'MDL-30456' of git://github.com/stronk7/moodle
2011-11-25 03:22:09 +01:00
Eloy Lafuente (stronk7)
ef77af3852
MDL-30456 backup - avoid missing deleted users on backup
2011-11-25 03:16:53 +01:00
AMOS bot
64432a901c
Automatically generated installer lang files
2011-11-25 00:30:42 +00:00
Sam Hemelryk
77da06ceb4
Merge branch 'MDL-30422-master' of git://github.com/ankitagarwal/moodle
2011-11-25 13:13:06 +13:00
Eloy Lafuente (stronk7)
ede7105fd9
MDL-27233 move the restorer enrol/ra creation to the very beginning of the restore process
...
Some early steps in restore are using capability checks to decide how to
restore some information. But at that stage, if the course contents have
been removed and the user had perms at course level only (usually teacher)
the process can fail because some content is not restoreable due to the
lack of permissions.
Moving the restorer step to the beginning really helps is those situations
and it does not hurt at all.
Also, fixed one notice detected when testing this.
2011-11-25 01:07:27 +01:00
Eloy Lafuente (stronk7)
2afaf485cf
Merge branch 'master' of git.moodle.org:/git/integration
2011-11-25 00:59:59 +01:00
Sam Hemelryk
d905b69e95
Merge branch 'MDL-29115' of git://github.com/rwijaya/moodle
2011-11-25 11:53:24 +13:00
Eloy Lafuente (stronk7)
0620787a17
Merge branch 'w47_MDL-27233_m22_restoreenrol' of git://github.com/skodak/moodle
2011-11-24 23:44:24 +01:00
Sam Hemelryk
7355a8e4b7
Merge branch 'wip-mdl-30391' of git://github.com/rajeshtaneja/moodle
2011-11-25 11:29:33 +13:00
Mary Evans
c42f1288ea
MDL-28625 - removed ul/ol styles from canvas/text.css
2011-11-25 11:04:49 +13:00
Petr Skoda
1f238ad4df
MDL-27233 fix variable names
...
Thanks Eloy!
2011-11-24 10:40:38 +01:00
Mary Evans
4d33fbef43
MDL-30243 - corrected admin tree to add custom css settings
2011-11-24 09:31:32 +00:00
Aparup Banerjee
c47b8c7d0c
Merge branch 'MDL-30288_override_checkbox' of git://github.com/andyjdavis/moodle
2011-11-24 16:14:37 +08:00
Ankit Kumar Agarwal
6348043461
MDL-30422 SCORM Fixing old variable use in interraction report
2011-11-24 12:53:37 +05:30
Aparup Banerjee
3ca3098f31
Merge branch 'MDL-29226' of git://github.com/lazydaisy/moodle
2011-11-24 14:39:53 +08:00
Andrew Davis
185db1c962
MDL-30288 gradebook: prevented grade grade feedback being wrapped in a text to html div tag which was causing it to look like feedback had been edited when it hadn't
2011-11-24 11:27:13 +08:00
AMOS bot
6c72ee14cd
Automatically generated installer lang files
2011-11-24 00:31:00 +00:00
Eloy Lafuente (stronk7)
c08a5622b8
Merge branch 'w47_MDL-29450_m22_removecoursecontent' of git://github.com/skodak/moodle
2011-11-23 23:01:27 +01:00
Petr Skoda
73d000f389
MDL-27233 allow adding of default role to restorers
2011-11-23 18:38:27 +01:00
Petr Skoda
d53e3298c0
MDL-27233 add new options to keep enrols and groups purging existing course in restore
2011-11-23 18:38:27 +01:00
Petr Skoda
16ef46e7b6
MDL-29450 improve and cleanup course content removal
...
New keep roles/enrolments and groups/groupings options, notification CSS fixed, standardised notification texts, added missing delete of module blocks, fixed file deleting and some other minor issues.
2011-11-23 18:37:36 +01:00
Andrew Robert Nicols
9e23487a10
MDL-30428 Add br tag when showing the 'Export to Portfolio' text
2011-11-23 14:07:52 +00:00
Eloy Lafuente (stronk7)
43fb30d652
Merge branch 'wip-mdl-30394' of git://github.com/rajeshtaneja/moodle
2011-11-23 13:37:37 +01:00
Eloy Lafuente (stronk7)
8ccbf8d1e5
Merge branch 'MDL-30409-master' of git://github.com/sammarshallou/moodle
2011-11-23 13:33:39 +01:00
Eloy Lafuente (stronk7)
07a27990a0
Merge branch 'wip-mdl-30375' of git://github.com/rajeshtaneja/moodle
2011-11-23 13:28:24 +01:00
Eloy Lafuente (stronk7)
c897e4639c
Merge branch 'MDL-30398-master' of git://github.com/ankitagarwal/moodle
2011-11-23 13:19:21 +01:00
Eloy Lafuente (stronk7)
9002363b35
Merge branch 'MDL-30390-grading-restore' of git://github.com/mudrd8mz/moodle
2011-11-23 13:16:04 +01:00
Eloy Lafuente (stronk7)
ab9dde2f97
Merge branch 'MDL-29095' of git://github.com/timhunt/moodle
2011-11-23 12:05:36 +01:00
Eloy Lafuente (stronk7)
48e74d2c10
Merge branch 'MDL-29060' of git://github.com/timhunt/moodle
2011-11-23 11:47:51 +01:00
