mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-04 16:10:59 +01:00
Code Issues Projects Releases Wiki Activity
64,378 Commits 36 Branches 523 Tags
Commit Graph

64378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sam marshall
77b3d9dfdf MDL-38196 Backup/restore: Display log if non-empty 
When doing a backup or restore operation with the normal user interface,
if there is anything in the backup/restore log, it will now be displayed
at the end of the process below the Continue button.

If you have developer debugging enabled, it sets the display level to
LOG_DEBUG and there will always be content in the log. Otherwise, it
uses LOG_INFO which generally means the log is empty, and nothing
displays (no visible change for users).
 2013-10-08 11:00:11 +01:00
Eloy Lafuente (stronk7)
467fc03982 Merge branch 'w41_MDL-42199_m26_rev' of https://github.com/skodak/moodle 2013-10-08 10:53:03 +02:00
Dan Poltawski
4f0eaf18f4 Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2013-10-08 16:42:17 +08:00
Damyon Wiese
7bfc69b0c2 Merge branch 'MDL-40053-master' of git://github.com/ankitagarwal/moodle 2013-10-08 16:19:25 +08:00
Damyon Wiese
44585a1ecd Merge branch 'MDL-41792_master' of https://github.com/markn86/moodle 2013-10-08 16:03:46 +08:00
Petr Škoda
307124bed8 MDL-42199 fix course revision test 2013-10-08 09:57:09 +02:00
Dan Poltawski
b56a6981b3 Merge branch 'MDL-41722-master' of git://github.com/sammarshallou/moodle 2013-10-08 15:19:09 +08:00
Ankit Agarwal
c4f9401ce4 MDL-40053 events: Replace add_to_log() with new events in core_notes 2013-10-08 15:12:20 +08:00
Ankit Agarwal
1b486fc501 MDL-40053 events: Write unit tests for note events 2013-10-08 15:12:20 +08:00
Ankit Agarwal
3cc4cc68e4 MDL-40053 events: write events for core_notes 
Following events were added in this commit :-
core\event\note_created
core\event\note_deleted
core\event\note_updated
core\event\notes_viewed
 2013-10-08 15:12:20 +08:00
Ankit Agarwal
34088ad057 MDL-40053 events: Generator for core_notes 2013-10-08 15:12:19 +08:00
Damyon Wiese
6abc173877 Merge branch 'MDL-41520-master-mod_lti-completion-view' of github.com:Trii/moodle 2013-10-08 14:43:14 +08:00
Dan Poltawski
bcb3c375e3 Merge branch 'MDL-40060-master' of git://github.com/FMCorz/moodle 2013-10-08 14:33:27 +08:00
Frederic Massart
7f6e3eefd1 MDL-40060 mod_book: Replace add_to_log with events 2013-10-08 14:11:10 +08:00
Damyon Wiese
43822d89c5 Merge branch 'MDL-32570-master' of git://github.com/danpoltawski/moodle 2013-10-08 13:47:49 +08:00
Dan Poltawski
fa96fb0cea Merge branch 'MDL-42131-master' of git://github.com/damyon/moodle 2013-10-08 13:33:25 +08:00
Dan Poltawski
8431c290fd Merge branch 'MDL-42150-master' of git://github.com/damyon/moodle 2013-10-08 13:25:12 +08:00
Rajesh Taneja
3f8ccd7c5f MDL-41843 IMS-LTI: Fixed exception namespace 2013-10-08 13:24:34 +08:00
Dan Poltawski
6cd7df4df1 Merge branch 'MDL-38655' of git://github.com/aolley/moodle 2013-10-08 13:21:30 +08:00
Dongsheng Cai
b56d1ecadb MDL-41843 Uses OAuthException in moodle\mod\lti namespace 2013-10-08 13:18:00 +08:00
Damyon Wiese
b242214269 Merge branch 'MDL-42122' of git://github.com/aolley/moodle 2013-10-08 12:48:10 +08:00
Damyon Wiese
944cfe1dec Merge branch 'MDL-40962-master' of git://github.com/ankitagarwal/moodle 2013-10-08 12:45:43 +08:00
Sam Hemelryk
ff8e257867 Merge branch 'MDL-40046-master' of git://github.com/ankitagarwal/moodle 2013-10-08 16:04:05 +13:00
Damyon Wiese
9e950187d5 MDL-23692 login: Revert change to files copyright 2013-10-08 10:31:56 +08:00
Damyon Wiese
18ef6201c0 Merge branch 'passwordreset-2013-10-07-1031Z' of https://github.com/peterbulmer/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2013-10-08 10:30:57 +08:00
Sam Hemelryk
cbf34f34cc Merge branch 'MDL-32188' of git://github.com/timhunt/moodle 
Conflicts:
	lib/db/upgrade.php
 2013-10-08 14:43:36 +13:00
Damyon Wiese
cbe5a022f1 MDL-41993 Atto: Strip yui ids from generated HTML. 2013-10-08 09:32:18 +08:00
Marina Glancy
04a4de20e8 Merge branch 'MDL-25176' of https://github.com/merrill-oakland/moodle 2013-10-08 12:03:15 +11:00
Marina Glancy
10a8d3dd7c Merge branch 'w41_MDL-37717_m26_enrolwarn' of https://github.com/skodak/moodle 2013-10-08 11:52:39 +11:00
Sam Hemelryk
87f28ddceb Merge branch 'w41_MDL-42078_m26_uninstallcleanup' of https://github.com/skodak/moodle 2013-10-08 11:20:51 +13:00
Petr Škoda
e734d8850c MDL-41197 normalize ascii text conversion 2013-10-07 23:54:05 +02:00
Sam Hemelryk
8050eec577 Merge branch 'MDL-42188' of git://github.com/stronk7/moodle 2013-10-08 08:52:42 +13:00
Sam Hemelryk
6455dec02d Merge branch 'MDL-41215-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-10-08 08:48:43 +13:00
Eloy Lafuente (stronk7)
10d13aaf25 MDL-42188 shifter: delete some orphaned files 2013-10-07 21:44:13 +02:00
Sam Hemelryk
81a939be02 Merge branch 'MDL-35926_alt_c' of git://github.com/rwijaya/moodle 2013-10-08 08:27:46 +13:00
Eloy Lafuente (stronk7)
e68ff1ec32 Merge branch 'MDL-41914-weekly' of git://github.com/jleyva/moodle 2013-10-07 16:06:32 +02:00
Petr Škoda
e87214bda7 MDL-42078 multiple uninstall improvements and cleanup 
Includes:
* update checker refactored to \core\update\ namespace
* plugininfo classes refactored to \core\plugininfo\ namespace
* plugin_manager renamed to core_plugin_manager
* redirect back to original page after plugin uninstall
* fixed assign subplugin uninstall
* move assign subplugins under the assignment in admin tree
* fixed plugininfo for all question related plugin types
* auth uninstall support
* added missing block dependencies
* added theme uninstall
* subplugin types are following the plugin on plugin overview page
* several performance improvements in plugin manager
* new warnigns when plugininfo are outdated or missing
* multiple fixes and other improvements
 2013-10-07 13:10:36 +02:00
Peter Bulmer
60a67d78e8 MDL-23692 forgotpw:adhere to site autocomp setting 2013-10-07 23:29:29 +13:00
Damyon Wiese
033f721362 MDL-31830 course: Remove unused shifter built js files 2013-10-07 15:58:59 +08:00
Peter Bulmer
2f0dd8d5bd MDL-23692 forgotpw: Coding style tidyups. 2013-10-07 20:54:51 +13:00
Damyon Wiese
d4770c9f00 Merge branch '31830-26' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-10-07 15:28:45 +08:00
James Henestofel
6afe875edd MDL-38155 Enrolments: User can be suspended by bulk upload 
Added ability to suspend user enrolment during bulk upload,
this can be done by setting enrolstatus field in csv file
 2013-10-07 15:24:14 +08:00
Sam Hemelryk
7fd307b153 MDL-31830 course: fixed up minor points as noted by Damyon's integration review 
* Fixed typo breaking drag and drop of courses.
* Fixed the ' ' title for the create new button plus two other icons I found as well.
* Adding padding to items displayed in the action menu drop down. base + bootstrapbase.
* Padding adjusted to the same as on the course page. base + bootstrapbase.
* Removed hover icon from categories. base only.
* Fixed categroy typo
* Removed min-width that was being applied to coursename making its clickable area larger than normal.
* The category tree is now presented using aria attributes as per http://www.w3.org/WAI/GL/wiki/Using_ARIA_trees
* Bulk action selectors now use aria-labelledby
* Category course count now given access hidden label.
* Pagination links now have better titles.
* The course action icons now present with role=button
 2013-10-07 19:41:52 +13:00
rwijaya
586d393fd3 MDL-35926 notification dialog: trap tab focus within dialog modal. 2013-10-07 12:40:16 +08:00
Sam Hemelryk
4d00df46b1 Merge branch 'w41_MDL-42040_m26_shutdown' of https://github.com/skodak/moodle 2013-10-07 17:38:25 +13:00
Sam Hemelryk
8aa3aa3dfd MDL-31830 course: management behat tests corrected after fixes 2013-10-07 17:34:09 +13:00
Dan Poltawski
d1050e406f Merge branch 'MDL-42013_master' of git://github.com/dmonllao/moodle 2013-10-07 11:26:37 +08:00
Sam Hemelryk
8618757c66 Merge branch 'w41_MDL-41220_m26_pluginlist' of https://github.com/skodak/moodle 2013-10-07 15:51:45 +13:00
Sam Hemelryk
6ac0b01175 Merge branch 'MDL-42072_master' of https://github.com/totara/openbadges 
Conflicts:
	badges/assertion.php
 2013-10-07 15:40:48 +13:00
Adrian Greeve
94b1577a5a MDL-42098 - mod_forum: Update webservice sql query to include all name fields. 2013-10-07 10:02:44 +08:00