mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-13 12:34:28 +01:00
Code Issues Projects Releases Wiki Activity
53,705 Commits 36 Branches 523 Tags
Commit Graph

53705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
7b06151288 Merge branch 'MDL-22504_drag_and_drop_upload_final' of https://github.com/davosmith/moodle 
Conflicts:
	course/lib.php
	theme/base/style/course.css
 2012-05-17 10:55:35 +12:00
Eloy Lafuente (stronk7)
94dc3c7d1e MDL-24419 (5): Coding style cleanup 2012-05-17 00:51:50 +02:00
Sam Hemelryk
fbb4c959b5 MDL-32881 Prevent course/view.php from being cached 
This should prevent browser caching which will ensure that changes made
using the course javascript (e.g. drag/drop, show/hide) will not be 'lost'
by using the browser back button.

This reverts commit 3aaa1843999eeb1832331ec5c8b30865fdba9710.
 2012-05-17 10:12:29 +12:00
Eloy Lafuente (stronk7)
dd420abadf Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	lib/db/upgrade.php
	lib/phpunit/lib.php
	version.php

Fixed:
    lib/db/upgrade.php - duplicate course->sectioncache add code
    lib/db/install.xml - cleanup needed because xmldb editor was not used
    lib/phpunit/classes/util.php - cleanup $GROUPLIB_CACHE on test reset
 2012-05-16 23:53:47 +02:00
Eloy Lafuente (stronk7)
0c408f5a3d NOBUG: Minibump to get latest WS installed 2012-05-16 16:28:59 +02:00
Eloy Lafuente (stronk7)
ea01d3c601 Merge branch 'MDL-32233-core_course_duplicate_course-usersdata' of git://github.com/jleyva/moodle 2012-05-16 16:23:00 +02:00
Juan Leyva
d7f465d497 MDL-32233 core_course_duplicate_course: Forcing backup and restore in MODE_SAMESITE always as suggested by Eloy. 2012-05-16 16:10:47 +02:00
Juho Viitasalo
e566bfa1ae MDL-31850 wiki: extra whitespace removed from form 2012-05-16 03:43:17 -07:00
Juan Leyva
6c7d3e3100 MDL-32233 core_course_duplicate_course: Fixed integrator review details described here http://tracker.moodle.org/browse/MDL-32233?focusedCommentId=157707&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-157707 2012-05-16 12:10:09 +02:00
Andrew Robert Nicols
c9cbb5a9bf MDL-33025 Ensure that hitting cancel clears the resource title editor 2012-05-16 10:56:45 +01:00
Andrew Robert Nicols
e0319e7be7 MDL-33025 Ensure that popups aren't triggered when editing resource titles 2012-05-16 10:46:09 +01:00
Eloy Lafuente (stronk7)
6b4769bc8b Merge branch 'MDL-32662-core_course_groups_xxx_groupings' of git://github.com/jleyva/moodle 2012-05-16 11:41:48 +02:00
Juan Leyva
2c8ad38eff MDL-32662 core_group_xxx_groupings: Fixed integrator review potential problem detected in update_groupings. More info: http://tracker.moodle.org/browse/MDL-32662?focusedCommentId=157706&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-157706 2012-05-16 10:45:40 +02:00
Aparup Banerjee
485e67982c Merge branch 'MDL-32633' of git://github.com/timhunt/moodle 2012-05-16 15:59:07 +08:00
Davo Smith
33b24bdd99 MDL-22504 Course drag and drop upload - moved file locations 2012-05-16 08:25:22 +01:00
Aparup Banerjee
9e66e96049 Merge branch 'MDL-31657' of git://github.com/scriby/moodle 2012-05-16 14:32:51 +08:00
Aparup Banerjee
7585ac89bd Merge branch 'MDL-32988-master' of git://github.com/sammarshallou/moodle 2012-05-16 14:03:56 +08:00
Aparup Banerjee
ca91bdcdf7 MDL-32921 lti : reused a moodle_url. 2012-05-16 13:49:32 +08:00
Aparup Banerjee
184287f0ce Merge branch 'MDL-32921' of git://github.com/scriby/moodle 2012-05-16 13:48:42 +08:00
Aparup Banerjee
e7ebfb8058 Merge branch 'MDL-32005-master-10' of git://git.luns.net.uk/moodle 
- fixed up comments (was phpdoc blocks)
 2012-05-16 10:39:48 +08:00
Sam Hemelryk
19d1525f6b Merge branch 'MDL-32641-master-1' of git://git.luns.net.uk/moodle 2012-05-16 13:14:59 +12:00
Sam Hemelryk
ba94f1d503 Merge branch 'MDL-32889-master' of https://github.com/mackensen/moodle 2012-05-16 13:09:32 +12:00
AMOS bot
bbbb140065 Automatically generated installer lang files 2012-05-16 00:31:32 +00:00
Aaron Barnes
1d09e12936 MDL-32016 unit tests: Remove hard coded file hash and calculate dynamically 2012-05-16 11:55:39 +12:00
Sam Hemelryk
a5bf3c520f Merge branch 'MDL-31215-master-11' of git://git.luns.net.uk/moodle 
Conflicts:
	course/lib.php
 2012-05-16 09:59:45 +12:00
Sam Hemelryk
fdbd219b33 Merge branch 'MDL-30434_debug_exception' of git://github.com/andyjdavis/moodle 2012-05-16 09:51:48 +12:00
Sam Hemelryk
3cb5b9ccf6 Merge branch 'MDL-31458' of git://github.com/danpoltawski/moodle 2012-05-16 09:12:17 +12:00
David Mudrak
cb1c329186 MDL-32337 admin notifications page checks for the recent updates fetch timestamp 
Now the message 'Your Moodle code is up-to-date!' is displayed only if
the fetch was done within the last hour. Otherwise, just the button
'Check for available updates' is displayed.
 2012-05-15 16:59:45 +02:00
Tim Hunt
4267fc5272 MDL-32727 quiz upgrade: sort out potential unique key violations 
... before trying to create the unique index that should be there.
The violations may come from old buggy code.

We do two things.
1. First we delete all previews.
2. Then, if there are still problems, we renumber attempts to eliminate
the duplicates.
 2012-05-15 15:23:53 +01:00
Petr Skoda
13f18ae197 MDL-33016 eliminate unnecessary DB query on /index.php 2012-05-15 15:40:22 +02:00
Petr Skoda
1d4d115ae1 MDL-32868 document PHPUNIT_LONGTEST in phpunit.xml.dist 2012-05-15 15:35:48 +02:00
Wiktor Wandachowicz
5bd2824a79 MDL-32204 MNet: set auth method to mnet for users enrolled remotely 2012-05-15 15:33:53 +02:00
David Mudrak
fef693c858 MDL-32610 cron based fetch of available updates can be disabled from config.php 2012-05-15 14:32:55 +02:00
David Mudrak
4db58f5fc7 MDL-32610 available updates info at the admin Notifications page can be hidden 2012-05-15 14:30:47 +02:00
David Mudrak
fa1d403f2e MDL-32610 available updates info at the Plugins check upgrade page can be hidden 2012-05-15 14:23:48 +02:00
David Mudrak
7716057f7d MDL-32610 available updates info at the Plugins overview admin page can be hidden 2012-05-15 13:43:08 +02:00
Eloy Lafuente (stronk7)
3e632cf4e6 Merge branch 'MDL-32998' of git://github.com/mouneyrac/moodle 2012-05-15 13:14:13 +02:00
Eloy Lafuente (stronk7)
5b0800d30e MDL-32949 ws: minor comments cleanup 2012-05-15 13:10:50 +02:00
sam marshall
a7d09b7008 MDL-32988 Lib: Course delete does availability/completion in wrong order 
When deleting modules that failed to delete using normal method, it deleted
the course-modules table first and then the availability/completion,
which depend on the entries in course-modules table. This commit switches
the order.
 2012-05-15 12:02:00 +01:00
Eloy Lafuente (stronk7)
4617939723 Merge branch 'MDL-32949' of git://github.com/mouneyrac/moodle 2012-05-15 12:59:18 +02:00
Jerome Mouneyrac
50f9449faa MDL-32998 add warnings structure 2012-05-15 18:40:06 +08:00
Jerome Mouneyrac
506df9acbf MDL-32949 return exception errorcode from the REST/SOAP/XMLRPC servers 2012-05-15 18:23:43 +08:00
David Mudrak
4fb3a06821 MDL-32610 site administration > server > update notifications section can be hidden 2012-05-15 11:39:04 +02:00
David Mudrak
5aab24ef17 MDL-32610 config-dist.php has info about $CFG->disableupdatenotifications flag 2012-05-15 11:37:59 +02:00
Aparup Banerjee
154128a50f Merge branch 'wip-mdl-32770' of git://github.com/rajeshtaneja/moodle 2012-05-15 16:41:54 +08:00
Andrew Robert Nicols
74b714df7e MDL-32005 Add idnumber field to groups and groupings 2012-05-15 09:38:51 +01:00
Dan Poltawski
61bb4184a7 Merge branch 'w20_MDL-25197_m23_innodb' of git://github.com/skodak/moodle 2012-05-15 15:41:46 +08:00
Dan Poltawski
b60b839d31 Merge branch 'MDL-32869_master' of git://github.com/kordan/moodle 2012-05-15 15:32:03 +08:00
Dan Poltawski
0a6202232c Merge branch 'MDL-32321_master' of git://github.com/kordan/moodle 2012-05-15 15:30:28 +08:00
Dan Poltawski
1e1931a797 Merge branch 'MDL-32978-master-integration' of git://github.com/FMCorz/moodle 2012-05-15 14:43:31 +08:00