mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-29 19:50:14 +01:00
Code Issues Projects Releases Wiki Activity
67,639 Commits 36 Branches 519 Tags
Commit Graph

67639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Greeve
f3f60eb27b MDL-45036 blocks: Update to the mentee block sql to incorporate additional name fields. 2014-04-11 14:00:46 +08:00
Dan Poltawski
af8a43248e weekly release 2.7dev 2014-04-11 11:39:56 +08:00
Dan Poltawski
ea1be84468 NOBUG: Fixed file access permissions 2014-04-11 11:39:56 +08:00
Dan Poltawski
f940d3ad6d Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-04-11 11:39:52 +08:00
Damyon Wiese
7b28067413 Revert "MDL-44758 editor-atto: prevent table-in-table creation" 
This reverts commit 3a6511a530015813f7bfda5547f8fc9de750efcf.

Conflicts:
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
	lib/editor/atto/plugins/table/yui/src/button/js/button.js
 2014-04-11 09:47:57 +08:00
AMOS bot
375aa96db0 Automatically generated installer lang files 2014-04-10 22:38:35 +00:00
Juan Leyva
ad5a8cd6a2 MDL-44342 air notifier: Fixied checking for empty values in event object 2014-04-10 17:34:14 +08:00
Juan Leyva
6acfacfa9a MDL-44342 airnotifier: Added new functions to the Mobile service 2014-04-10 17:34:03 +08:00
Dan Poltawski
e5d3f6ea26 Merge branch 'MDL-44868-master-fixup' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2014-04-10 14:51:42 +08:00
Rajesh Taneja
0adadbf00b MDL-44070 core_completion: Removed unwanted tag 2014-04-10 14:28:28 +08:00
Frederic Massart
5e543b4f76 MDL-44868 editor_atto: Remember the last focused button in the toolbar 2014-04-10 14:22:10 +08:00
Damyon Wiese
5582fe49cc MDL-44170 LTI - fix unit tests. 2014-04-10 14:15:02 +08:00
Dan Poltawski
c8d940a5a6 Merge branch 'MDL-44927-master-fix2' of https://github.com/damyon/moodle 2014-04-10 14:09:15 +08:00
Damyon Wiese
5f5d4e9e69 Merge branch 'MDL-44170-master' of https://github.com/adrianfish/moodle 2014-04-10 13:33:50 +08:00
Damyon Wiese
92810c07f7 MDL-44927 Atto: Fix bad merge of MDL-44760 (missing menu entry) 2014-04-10 13:26:03 +08:00
Damyon Wiese
0734383d63 MDL-44342 Airnotifier: Bug in retrieving user prefs (fixes fail in unit test) 2014-04-10 13:16:40 +08:00
Juan Leyva
2bb01d13cb MDL-44342 airnotifier: Change default Airnotifier url to use SSL 
This commit include also a fix for checking forced settings
 2014-04-10 09:25:32 +08:00
Sam Hemelryk
8abf605ee1 Merge branch 'MDL-44760-master-2' of https://github.com/andrewnicols/moodle 2014-04-10 09:26:07 +12:00
sam marshall
3e9c7420d3 MDL-44070 Behat: Fixed restrict_activity_by_date.feature 2014-04-09 17:51:59 +02:00
Rajesh Taneja
ae90dec5c2 MDL-44070 core_completion: Fixed behat 2014-04-09 14:24:55 +02:00
Dan Poltawski
1a1949437b Merge branch 'MDL-43856-master-fix1' of https://github.com/damyon/moodle 2014-04-09 17:37:24 +08:00
Damyon Wiese
16ad61bf55 MDL-43856 MathJax: Delay setting of lang until after MathJax startup 2014-04-09 16:44:40 +08:00
Damyon Wiese
21fd2384de Merge branch 'wip-MDL-40843-fix' of git://github.com/marinaglancy/moodle 2014-04-09 15:44:39 +08:00
Mark Nelson
f68fee244a MDL-42462 mod_feedback: added $OUTPUT to list of global variables used to avoid error 2014-04-09 15:37:21 +08:00
Dan Poltawski
8921c6c0c2 Merge branch 'MDL-42195-master-fix2' of https://github.com/damyon/moodle 2014-04-09 15:32:30 +08:00
Marina Glancy
488bbfb720 MDL-40843 chat: fixed bug in SQL query in recent activity block 2014-04-09 15:31:49 +08:00
Andrew Nicols
c63f90539a MDL-44760 editor_atto: Address issues with focus when closing menus 
Safari fires it's events in a slightly different order for the focusoutside
event which causes the focusAfterHide to be called *after* we change focus.

As a result, we must keep track of the menus which are currently open and
remove their focusAfterHide.
 2014-04-09 15:26:34 +08:00
Damyon Wiese
2471088111 MDL-42195 Bootstrap: Make selector for responsive images 100% the same as bootstrap3. 2014-04-09 14:57:33 +08:00
Marina Glancy
039d204abd MDL-44070 availability: corrected SQL to be mysql-compatible 2014-04-09 14:41:12 +08:00
Damyon Wiese
f1dce5734e MDL-44268 Assign: Fix behat test for assigned marker filter 2014-04-09 14:29:46 +08:00
Damyon Wiese
d6a3f559db MDL-44268 Assign: Improve the "not submitted" filter 2014-04-09 14:29:46 +08:00
Jonathon Fowler
c80d59f269 MDL-44268 assign: add 'not submitted' and 'no marker' filter options 2014-04-09 14:29:46 +08:00
Dan Poltawski
3c72b71191 Merge branch 'MDL-41123-master' of git://github.com/ankitagarwal/moodle 2014-04-09 14:03:42 +08:00
Damyon Wiese
43968c9f10 Merge branch 'mdl44669-master' of https://github.com/tlock/moodle 2014-04-09 13:05:46 +08:00
Dan Poltawski
a935cccb2b Merge branch 'MDL-31679' of git://github.com/aolley/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-09 12:49:35 +08:00
Dan Poltawski
c559161f4a Merge branch 'MDL-39759_http_response_code_master' of https://github.com/dongsheng/moodle 2014-04-09 12:38:30 +08:00
Dan Poltawski
28c247a735 MDL-44507 filemanger: fix coding style 2014-04-09 12:10:30 +08:00
Dan Poltawski
9eeacad9b8 Merge branch 'MDL-44507_master' of https://github.com/SWiT/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-09 11:52:33 +08:00
Dan Poltawski
1b9a1e8128 Merge branch 'MDL-29572_master' of https://github.com/jrchamp/moodle 2014-04-09 11:38:42 +08:00
Damyon Wiese
48dc9f0175 MDL-44927 Atto: Table editor typo that prevents creation of new tables. 2014-04-09 11:31:26 +08:00
Dan Poltawski
020af1058d Merge branch 'MDL-39740_grade_item_idnumber_fix' of git://github.com/ashleyholman/moodle 2014-04-09 11:12:55 +08:00
Marina Glancy
47a1315f02 Merge branch '44944-27' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-09 09:48:41 +08:00
Sam Hemelryk
e97b942223 Merge branch 'MDL-40908_master' of https://github.com/markn86/moodle 2014-04-09 11:26:33 +12:00
AMOS bot
98f5b72acc Automatically generated installer lang files 2014-04-08 22:38:25 +00:00
Sam Hemelryk
6a90bc5e05 Merge branch 'MDL-44870-master' of git://github.com/FMCorz/moodle 2014-04-09 10:37:05 +12:00
Sam Hemelryk
b983a5d869 Merge branch 'MDL-44765-master' of git://github.com/phalacee/moodle 2014-04-09 10:26:33 +12:00
Sam Hemelryk
6ef3728805 Merge branch 'wip-MDL-44971-2.7-submission_reopen_hook' of https://github.com/catalyst/moodle 2014-04-09 10:15:50 +12:00
Sam Hemelryk
0a293483e8 MDL-39833 format: tidied up API improvement to allow for future backport 2014-04-09 10:09:44 +12:00
Sam Hemelryk
da98185a58 Merge branch 'MDL-39833' of https://github.com/shashirepo/moodle 2014-04-09 10:09:02 +12:00
Damyon Wiese
86bd7af5be MDL-42195 Bootstrap - put border and vertical-align back in the reset for all images 2014-04-08 17:04:43 +08:00