moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57187 commits 37 branches 540 tags 1.3 GiB
Commit graph

14499 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
2bc620b363 Merge branch 'w37_MDL-35071_m24_enrolrestore' of git://github.com/skodak/moodle 2012-09-14 01:08:49 +02:00
Sam Hemelryk
fd9a54c2e3 Merge branch 'wip-mdl-30667' of git://github.com/rajeshtaneja/moodle 2012-09-13 11:19:30 +12:00
Eloy Lafuente (stronk7)
7ec68510d9 Merge branch 'MDL-34082' of git://github.com/timhunt/moodle 2012-09-12 17:19:17 +02:00
Tim Hunt
e08eaf7da3 MDL-34082 course restrict modules: typo in MDL-19125 upgrade code. 2012-09-12 16:15:11 +01:00
Sam Hemelryk
6aa130499b Merge branch 'wip-mdl-34568' of git://github.com/rajeshtaneja/moodle 2012-09-12 11:08:56 +12:00
Rex Lorenzo
ff37d63c1b MDL-35376 - Shortcut/alias not working for Private file repo 2012-09-11 14:23:12 -07:00
Rex Lorenzo
1336e2e160 MDL-35374 - Cannot delete blocks off frontpage 2012-09-11 12:27:17 -07:00
Eloy Lafuente (stronk7)
e633ea6b46 Merge branch 'MDL-34984' of git://github.com/rwijaya/moodle 2012-09-11 16:28:46 +02:00
Eloy Lafuente (stronk7)
c0d716d7b9 Merge branch 'MDL-35171' of git://github.com/merrill-oakland/moodle 2012-09-11 02:44:30 +02:00
Eloy Lafuente (stronk7)
513480c22a Merge branch 'MDL-35257-master' of git://github.com/danpoltawski/moodle 2012-09-11 01:53:17 +02:00
Sam Hemelryk
c91614ef52 Merge branch 'wip-MDL-32785-master-v3' of git://github.com/abgreeve/moodle 2012-09-11 10:38:23 +12:00
Eloy Lafuente (stronk7)
5e51915c80 Merge branch 'MDL-8307-master' of git://github.com/FMCorz/moodle 2012-09-10 23:35:12 +02:00
Eloy Lafuente (stronk7)
2c248bd416 Merge branch 'w37_MDL-35284_m24_borkedtoolbar' of git://github.com/skodak/moodle 
Conflicts:
	lib/editor/tinymce/version.php
 2012-09-10 22:13:36 +02:00
Petr Škoda
5ba3a966f6 MDL-35284 patch empty toolbar crashing TinyMCE 2012-09-10 22:10:25 +02:00
Petr Škoda
6dd4241f81 MDL-35318 fix lang revision incrementation conditions 2012-09-10 20:23:14 +02:00
David Mudrák
c62580b9d0 MDL-35344 Ignore available updates info with invalid format 
Previously when the server response validation had failed, the property
available_update_checker::recentresponse was left as NULL. This caused
problems in available_update_checker::compare_responses() that expects
proper arrays passed.

This patch makes invalid data being ignored by setting the property to
an empty array as if no data have been fetched yet. A debugging message
is thrown so the admins will be able to diagnose eventual problems in
the future.
 2012-09-10 17:29:42 +02:00
Adrian Greeve
8e73fbf5aa MDL-32785 - lib - Ignorning hard frozen fields when submitting data. 2012-09-10 11:12:10 +08:00
Petr Škoda
79df150a62 MDL-35318 use new lang revision to invalidate TinyMCE lang caches 2012-09-09 12:18:32 +02:00
Petr Škoda
a46e11b5df MDL-35318 add lang revision counter and improve PHPUnit test reset 
We need this for hacks that need to find out if strings changed.
 2012-09-09 12:15:30 +02:00
Petr Škoda
29149f981c MDL-35289 use unmodified TinyMCE 2012-09-09 11:57:25 +02:00
Petr Škoda
7a7b8a1f19 MDL-35071 redesign enrol restore 
Includes option to convert all enrolments to enrol_manual instances, support for mapping of custom fields and fixes for several other problems. This does not include support for custom enrol tables, it will be addressed in another issue.
 2012-09-07 11:11:28 +02:00
Petr Škoda
a4a4b2f6c6 MDL-35289 use new TinyMCE en lang import 
AMOS BEGIN
  MOV [common:browsemedia,editor_tinymce],[moodlemedia:browsemedia,tinymce_moodlemedia]
  MOV [common:browseimage,editor_tinymce],[moodleimage:browseimage,tinymce_moodleimage]
AMOS END
 2012-09-07 10:11:37 +02:00
Rossiani Wijaya
8510d731bb MDL-34984 admin setting: fixed labeling and shortname display for admin setting 2012-09-07 15:34:38 +08:00
Frederic Massart
59b9a14063 MDL-8307 Course: Course requests can suggest a category 2012-09-07 11:22:08 +08:00
Dan Poltawski
4501a081d3 MDL-35257 lib: if $CFG->logguests is disabled, avoid some log actions 
This is for performance, else there can be great contention on the guest
user record as we've seen on moodle.org.
 2012-09-07 10:25:22 +08:00
Rajesh Taneja
0465ef6e31 MDL-34568: Accessibility: Added missing lables in quiz section 
AMOS BEGIN
 CPY [pluginname,grade_export_xls],[downloadexcel,table]
 CPY [pluginname,grade_export_ods],[downloadods,table]
AMOS END
 2012-09-07 10:18:15 +08:00
Eloy Lafuente (stronk7)
3b70685c26 fix permissions 2012-09-07 02:36:04 +02:00
Eloy Lafuente (stronk7)
df5ac8d0ec MDL-6424 - blocks - Add missing global vars. 2012-09-06 19:39:49 +02:00
Eloy Lafuente (stronk7)
7c2bc95ae2 Merge branch 'wip-MDL-6424-master' of git://github.com/abgreeve/moodle 2012-09-06 19:31:43 +02:00
Eloy Lafuente (stronk7)
0cbf023ab6 Merge branch 'w36_MDL-35172_m24_editortoolbar' of git://github.com/skodak/moodle 2012-09-06 12:08:26 +02:00
Eloy Lafuente (stronk7)
0e08f394f5 Merge branch 'MDL-35034-master' of git://github.com/FMCorz/moodle 2012-09-06 02:01:11 +02:00
Eloy Lafuente (stronk7)
44a2eb911b Revert "MDL-30643 - Fixed speed issues with stats generation." 
This reverts commit 5d911452cd.
 2012-09-05 19:04:01 +02:00
Eloy Lafuente (stronk7)
cbcf50a2f4 Revert "MDL-30643 - Added additional temporary tables to deal with log growth in daily tables." 
This reverts commit e710925a24.
 2012-09-05 19:03:46 +02:00
Eloy Lafuente (stronk7)
583a19d772 Revert "MDL-30643 - Moved table create/drop out of loop to fix performance issue." 
This reverts commit 678f53c5f7.
 2012-09-05 19:03:30 +02:00
Eloy Lafuente (stronk7)
6a7fb9f778 Revert "MDL-30643 - Now loading table definitions from XML files." 
This reverts commit d352e733b3.
 2012-09-05 19:03:17 +02:00
Eloy Lafuente (stronk7)
8127f098d8 Revert "MDL-30643 - Added statslib test file." 
This reverts commit 8646f5a436.
 2012-09-05 19:03:06 +02:00
Eloy Lafuente (stronk7)
06d54f411c Revert "MDL-30643 - Fixing minor log output error and test cases." 
This reverts commit 2da32bd6a5.
 2012-09-05 19:02:54 +02:00
Eloy Lafuente (stronk7)
fa4fbd9790 Revert "MDL-30643 - Updated test cases to handle timezones better." 
This reverts commit f0f0fec295.
 2012-09-05 19:02:38 +02:00
Eloy Lafuente (stronk7)
447721b44f Revert "RFC-30643 - Removed get_context_instance calls." 
This reverts commit eb0ffd3214.
 2012-09-05 19:02:27 +02:00
Eloy Lafuente (stronk7)
ac9fe9b3a5 Revert "MDL-30643 fixed whitespace" 
This reverts commit 5c27678d3a.
 2012-09-05 19:02:07 +02:00
Aparup Banerjee
379833e0d0 Merge branch 'MDL-35089' of git://github.com/stronk7/moodle 2012-09-05 15:02:17 +08:00
Petr Škoda
717a993122 MDL-35172 fix handling of more than 10 tinymce toolbars 2012-09-05 08:23:36 +02:00
Aparup Banerjee
01ba041fa6 Merge branch 'w36_MDL-35177_m24_editoradminicons' of git://github.com/skodak/moodle 2012-09-05 11:45:56 +08:00
Aparup Banerjee
937b0acba1 MDL-26504 blog: fixed SQL to add explicit casting 2012-09-05 10:25:22 +08:00
Eloy Lafuente (stronk7)
4bab07c68c Merge branch 'MDL-34997-master' of git://github.com/FMCorz/moodle 2012-09-05 00:52:17 +02:00
Aparup Banerjee
5c27678d3a MDL-30643 fixed whitespace 2012-09-05 01:51:39 +08:00
Aparup Banerjee
b0381539e5 Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle 2012-09-05 01:16:51 +08:00
Tyler Bannister
eb0ffd3214 RFC-30643 - Removed get_context_instance calls. 
- Added fifth table to speed up enrolment look ups.
 2012-09-04 10:11:16 -04:00
Tyler Bannister
f0f0fec295 MDL-30643 - Updated test cases to handle timezones better. 2012-09-04 10:10:19 -04:00
Aparup Banerjee
736cc6a246 Merge branch 'MDL-26504_blog_unregister' of git://github.com/andyjdavis/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-09-04 13:43:11 +08:00