51832 Commits

Author SHA1 Message Date
Sam Hemelryk
cb0a069019 Merge branch 'MDL-27764' of git://github.com/stronk7/moodle 2012-03-06 10:19:28 +13:00
Sam Hemelryk
22e5ef529d Merge branch 'MDL-31328_master' of git://github.com/lazydaisy/moodle 2012-03-06 09:57:06 +13:00
Gootvilig David Hai
fe0fbfae31 MDL-31876 questionlib: fix question_has_capability_on memory bloat 2012-03-05 14:40:28 +02:00
Sam Hemelryk
1392fd114a Merge branch 'MDL-31828' of git://github.com/timhunt/moodle 2012-03-05 17:03:34 +13:00
Sam Hemelryk
0d4f9805ef Merge branch 'w10_MDL-31807_m23_cohort' of git://github.com/skodak/moodle 2012-03-05 16:56:30 +13:00
Sam Hemelryk
0d077cef06 Merge branch 'MDL-31821_master' of git://github.com/lazydaisy/moodle 2012-03-05 16:45:31 +13:00
Sam Hemelryk
41b542d96d Merge branch 'MDL-29347' of git://github.com/mouneyrac/moodle 2012-03-05 16:12:38 +13:00
Sam Hemelryk
48c6ebebbf MDL-30724 mod_assignment: Minor fixes during integration 2012-03-05 16:09:55 +13:00
Sam Hemelryk
29747783e2 Merge branch 'm_MDL-30724_count_real_submissions_eloy_suggests' of git://github.com/gerrywastaken/moodle 2012-03-05 16:08:19 +13:00
Tony Levi
a7c9609ba5 MDL-31819: admin: allow install to proceed when multiple admins exist already 2012-03-05 15:42:08 +13:00
Sam Hemelryk
48e529c932 MDL-31794 theme_formalwhite: Fixed up tabs 2012-03-05 15:29:15 +13:00
Sam Hemelryk
8576f705f7 Merge branch 'MDL-31707' of git://github.com/stronk7/moodle 2012-03-05 15:21:29 +13:00
Kordan
c18b6f6c50 MDL-29367 theme_formalwhite: Lines between RSS and upcoming events 2012-03-05 15:14:14 +13:00
Kordan
f1f04a5a06 MDL-31786 theme_formalwhite: bigger userid and password fields size in login page 2012-03-05 15:04:43 +13:00
kordan
7547184df1 MDL-31794 theme_formalwhite: let tab-bar give evidence of the current tab and page 2012-03-05 15:01:15 +13:00
Eloy Lafuente (stronk7)
b904130b5b MDL-27764 restore - always restore as much info as possible (1.9 approach)
In 2.0 we had reduced the types of restore operations where we allow
to load the section names and section descriptions, only proceeding
when restoring to new course or to existing course, deleting.

With this patch, we change to the old 1.9 way, that was to restore
the section information always, no matter of the type of restore
operation (course restore, import, to new or to existing course,
deleting or adding). The only exception is that it's always checked that
the target section names and descriptions are empty.
2012-03-05 02:41:33 +01:00
Sam Hemelryk
9394d86367 Merge branch 'MDL-26037' of git://github.com/stronk7/moodle 2012-03-05 14:03:34 +13:00
Sam Hemelryk
37b6e7a03c Merge branch 'MDL-29248' of git://github.com/stronk7/moodle 2012-03-05 13:54:46 +13:00
Sam Hemelryk
b04d5217bf Merge branch 'MDL-31710' of git://github.com/stronk7/moodle 2012-03-05 13:36:34 +13:00
Sam Hemelryk
36d1d23179 Merge branch 'MDL-31642_dndupload_filemanager_notification_text' of git://github.com/davosmith/moodle 2012-03-05 13:31:08 +13:00
Sam Hemelryk
9b0e5e9d0d Merge branch 'MDL-31643_dndupload_reject_all_files' of git://github.com/davosmith/moodle 2012-03-05 13:22:04 +13:00
Kordan
686e10ce43 MDL-29127 theme_formalwhite: highlight for unread forum post 2012-03-05 12:38:12 +13:00
Sam Hemelryk
272853aec9 Merge branch 'master_MDL-31749' of git://github.com/danmarsden/moodle 2012-03-05 12:30:36 +13:00
kordan
43b64c9763 MDL-31866 theme_formalwhite: increased the line heigth for courses in category page 2012-03-05 12:27:44 +13:00
Sam Hemelryk
26f76c9c6c Merge branch 'MDL-24235-master' of https://github.com/mackensen/moodle 2012-03-05 12:22:34 +13:00
Sam Hemelryk
a45621394b Merge branch 'MDL-31806-master' of https://github.com/mackensen/moodle 2012-03-05 12:05:53 +13:00
Sam Hemelryk
0170ada63b Merge branch 'MDL-30893-master' of git://github.com/ankitagarwal/moodle 2012-03-05 11:52:59 +13:00
Sam Hemelryk
936deb7e68 Merge branch 'MDL-31466-master' of git://github.com/ankitagarwal/moodle 2012-03-05 11:35:18 +13:00
Sam Hemelryk
63ecec3c37 Merge branch 'MDL-31655-master-3' of git://git.luns.net.uk/moodle 2012-03-05 11:28:38 +13:00
Sam Hemelryk
8498e630af Merge branch 'MDL-31656-master-3' of git://git.luns.net.uk/moodle 2012-03-05 11:09:29 +13:00
Sam Hemelryk
a5dd1f4fb7 MDL-31660 forms: Added checks for form change detection 2012-03-05 11:00:14 +13:00
Sam Hemelryk
f788011045 Merge branch 'MDL-31660-master-3' of git://git.luns.net.uk/moodle 2012-03-05 10:59:22 +13:00
Sam Hemelryk
06422b0a22 Merge branch 'MDL-31353_grader_io' of git://github.com/andyjdavis/moodle 2012-03-05 10:46:07 +13:00
AMOS bot
ac4f3f330e Automatically generated installer lang files 2012-03-04 00:31:44 +00:00
Petr Skoda
d1f582d99c MDL-31079 detect js and css minimisation failures 2012-03-03 11:53:53 +01:00
Petr Skoda
3fed29a792 MDL-31301 move textlib_get_instance() to deprecatedlib 2012-03-03 11:46:33 +01:00
Petr Skoda
6f3451e540 MDL-31301 remove all uses of moodle_strtolower() and deprecated it 2012-03-03 11:46:26 +01:00
Petr Skoda
f8311defeb MDL-31301 use static textlib methods 2012-03-03 11:46:13 +01:00
Petr Skoda
4a63589000 MDL-31361 allow unenrolling of suspended users in enrol/database 2012-03-03 11:37:51 +01:00
Petr Skoda
51a1c153d2 MDL-31785 fix and improve htmlpurifier tests 2012-03-03 11:23:36 +01:00
Petr Skoda
e9df54952c MDL-31785 import HTMLPurifier 4.4.0+
Includes one extra fix for _blank 8c9d461a6259d7b8ac4ae5c9c9e95ab176cfcda3 compared to 4.4.0 release.
2012-03-03 11:11:48 +01:00
Petr Skoda
081003b685 MDL-31807 fix invalid nulls in cohort components
Credit goes to Stephen.
2012-03-03 10:56:31 +01:00
Petr Skoda
866e1112c5 MDL-30636 switch to new TinyMCE 3.4.9 2012-03-03 10:46:39 +01:00
Petr Skoda
6500eefec2 MDL-30636 add TinyMCE 3.4.9 2012-03-03 10:44:15 +01:00
Mary Evans
a897af2d2c MDL-31821_master theme_splash: added color white to h1 welcome text and a:link in userdetails 2012-03-03 00:39:45 +00:00
Charles Fulton
be90ed23b5 MDL-24235 bennu: remove dependency on mbstring from library 2012-03-02 08:01:30 -08:00
Eloy Lafuente (stronk7)
4c000e8481 MDL-31710 webservice unit test: cleanup
This commit:

- fixes some missing (public|private) scope in methods.
- fixes whitespace
- fixes inline comments
- fixes other codechecker warnings/errors
2012-03-02 12:17:58 +01:00
Adrian Greeve
901d58dfd3 MDL-29086 - data - Fix for allowing the deletion of database activity presets.
Thank you to Matthias Hunstock for providing the patch for this.
2012-03-02 14:18:32 +08:00
Ankit Agarwal
cc4e04798e MDL-30893 Accessibility Submit button in forgot password page now have separate ids 2012-03-02 11:25:13 +08:00
Ankit Kumar Agarwal
9ccadad391 MDL-30976 Docs Documenting Conditional APIs 2012-03-02 10:22:46 +08:00