mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 23:20:09 +01:00
Code Issues Projects Releases Wiki Activity
59,553 Commits 36 Branches 527 Tags
Commit Graph

15283 Commits

Author SHA1 Message Date
Frederic Massart
04cbea2cd6 MDL-36900 files: D&D upload uses new file name increment function 2013-03-08 10:21:01 +08:00
Frederic Massart
8158fe0542 MDL-36900 repository: File Manager new folder UI improvements 2013-03-08 10:21:01 +08:00
Eloy Lafuente (stronk7)
8673a98d1d MDL-38378 Take rid of harcoded db prefix and bump. 2013-03-08 00:27:01 +01:00
Eloy Lafuente (stronk7)
a75dfd6f33 MDL-38345 Prevent undefined CFG leading to DB error. 
It seems that MDL-32975, no matter a version bump
was done, leads to the $CFG->navsortmycoursessort
setting undefined sometimes. And that ends with an error
visiting the /my page. This just ensures a safe default
if the setting is undefined/empty.
 2013-03-07 10:21:03 +01:00
Damyon Wiese
3d231eda76 Revert "MDL-38055 block_courseoverview: fixed formatting of course fullname" 
This reverts commit a9ff59979fbda8d26214013eb8da7440614d2bd5.
This reverts commit 4e83302f6f6b95504cc33e7a75e3694750b5621e.

This issue has failed testing and will be delayed
 2013-03-07 10:30:37 +08:00
Damyon Wiese
005c6640dd MDL-38173 Course: Fix DB from regression when adding a (new) course module to a section. 2013-03-06 23:59:19 +08:00
Eloy Lafuente (stronk7)
4384eea0c9 Merge branch 'MDL-37958_master-fix' of git://github.com/dmonllao/moodle 2013-03-06 10:31:20 +01:00
David Monllao
31c75894e0 MDL-38271 behat: Fixing typo 2013-03-06 15:07:36 +08:00
David Monllao
0a7f6a02eb MDL-37958 behat: Nasty strings in HTML 
Nasty strings includes html entities and
non-breaking spaces followed by spaces which makes
very hard to find these strings in the DOM html,
this patch keeps the non-breaking spaces and all
the nasty characters, but leaves them isolated from
other regular spaces. It swaps the strings to HTML before
finding elements in the HTML that matches that contents.
 2013-03-06 13:34:09 +08:00
Sam Hemelryk
c629c91feb MDL-32975 navigation: fixed error when viewing my with no enrolments 2013-03-06 14:35:19 +13:00
Eloy Lafuente (stronk7)
ab1e921c31 Merge branch 'MDL-36749-m' of git://github.com/andrewnicols/moodle 2013-03-06 01:19:17 +01:00
Andrew Robert Nicols
a6d81a73ac MDL-36749 lib Complete deprecation of old_help_icon 
This deprecates the old_help_icon and helpbutton functions. Since they can
no longer be used, the renderers are removed altogether.
 2013-03-05 19:07:06 +00:00
Eloy Lafuente (stronk7)
88906d068d Merge branch 'MDL-37958_master' of git://github.com/dmonllao/moodle 2013-03-05 19:28:14 +01:00
Eloy Lafuente (stronk7)
8d0a042263 Merge branch 'MDL-38327_master' of git://github.com/dmonllao/moodle 2013-03-05 19:26:52 +01:00
Eloy Lafuente (stronk7)
4afd580231 Merge branch 'MDL-38271_master' of git://github.com/dmonllao/moodle 2013-03-05 15:43:15 +01:00
David Monllao
6fe3986dec MDL-38007 behat: Refining error texts 
Also removing a couple of silly notices
 2013-03-05 16:52:48 +08:00
Damyon Wiese
d0eac6f639 Merge branch 'MDL-38178_master' of git://github.com/dmonllao/moodle 2013-03-05 15:10:52 +08:00
Aparup Banerjee
c0da001c49 Merge branch 'MDL-38025_master' of git://github.com/dmonllao/moodle 2013-03-05 14:43:46 +08:00
David Monllao
f8f1bdc315 MDL-38178 behat: Adding find_all and step to expand all form's fieldsets 2013-03-05 14:41:52 +08:00
Aparup Banerjee
212e5ee909 Merge branch 'MDL-38007_master' of git://github.com/dmonllao/moodle 2013-03-05 14:37:05 +08:00
David Monllao
5f26d1c8b8 MDL-38327 behat: Don't switch completely if switchcompletely is false 2013-03-05 14:03:50 +08:00
Damyon Wiese
a27996bbad Merge branch 'wip-MDL-38055-m25' of git://github.com/samhemelryk/moodle 2013-03-05 11:42:25 +08:00
Aparup Banerjee
d1e220eb0e Merge branch 'MDL-36171-m' of git://github.com/andrewnicols/moodle 2013-03-05 11:13:33 +08:00
David Monllao
15c7fb4adb MDL-37958 behat: Ignoring spaces when comparing field contents 2013-03-05 11:08:04 +08:00
Aparup Banerjee
fb3c1d2b34 Merge branch 'MDL-38067-m' of git://github.com/andrewnicols/moodle 2013-03-05 11:06:55 +08:00
Aparup Banerjee
23a6fca502 Merge branch 'MDL-34300-m' of git://github.com/andrewnicols/moodle 2013-03-05 10:37:33 +08:00
Frederic Massart
dfe203c12e MDL-34284 library: Import ZF2012-01 security patch for Zend 2013-03-05 10:35:56 +08:00
Sam Hemelryk
2e2bac9d32 Merge branch 'MDL-37932' of git://github.com/timhunt/moodle 2013-03-05 15:30:45 +13:00
Sam Hemelryk
627a43917a MDL-37127 js: fixed indentation of tooltip.js 2013-03-05 14:11:35 +13:00
Sam Hemelryk
5c1d5998ac Merge branch 'MDL-37127-m' of git://github.com/andrewnicols/moodle 2013-03-05 13:54:10 +13:00
Eloy Lafuente (stronk7)
86d053490d Merge branch 'wip-MDL-36215-m25' of git://github.com/samhemelryk/moodle 2013-03-05 01:27:50 +01:00
Eloy Lafuente (stronk7)
2b48123b92 Merge branch 'wip-MDL-38300-m25' of git://github.com/samhemelryk/moodle 2013-03-05 01:21:47 +01:00
Eloy Lafuente (stronk7)
adc4aca475 Merge branch 'MDL-37897' of git://github.com/jmvedrine/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-03-05 00:56:24 +01:00
Eloy Lafuente (stronk7)
cdbbd48a66 Merge branch 'MDL-38261-workshop-attachments-size' of git://github.com/mudrd8mz/moodle 2013-03-05 00:48:47 +01:00
Eloy Lafuente (stronk7)
2673254919 Merge branch 'wip-MDL-32975-m25' of git://github.com/samhemelryk/moodle 2013-03-04 23:47:13 +01:00
Sam Hemelryk
f87ce4e9a0 MDL-32975 navigation: Added option to select how my courses are sorted 2013-03-05 09:46:11 +13:00
Sam Hemelryk
cf7386139d MDL-31983 navigation: fixed copy+paste typo 2013-03-05 09:24:19 +13:00
Eloy Lafuente (stronk7)
25ba263d60 Merge branch 'MDL-38133-master' of git://github.com/sammarshallou/moodle 2013-03-04 20:37:57 +01:00
Eloy Lafuente (stronk7)
d03d5e7816 Merge branch 'wip-MDL-33013-m25' of git://github.com/samhemelryk/moodle 2013-03-04 20:18:48 +01:00
Eloy Lafuente (stronk7)
8b0f09d940 Merge branch 'MDL-36380-master' of git://github.com/FMCorz/moodle 2013-03-04 17:59:39 +01:00
Eloy Lafuente (stronk7)
d5834b3712 Merge branch 'MDL-38170-master' of git://github.com/sammarshallou/moodle 2013-03-04 16:25:00 +01:00
Sam Hemelryk
4ce761716c Merge branch 'MDL-31557_master' of git://github.com/markn86/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-03-04 14:35:59 +13:00
Sam Hemelryk
74bf99ddad Merge branch 'MDL-37625-master' of https://github.com/jfilip/moodle 2013-03-04 14:18:49 +13:00
Sam Hemelryk
121e604851 Merge branch 'MDL-38168-master' of git://github.com/sammarshallou/moodle 2013-03-04 13:35:16 +13:00
Frederic Massart
954b354511 MDL-37507 repositories: improved formatting of external resources 2013-03-04 13:28:41 +13:00
Mark Nielsen
8d220cb552 MDL-36901: Remove system paths from exceptions 
Replaces any server paths, like dataroot, with a token
in exception messages and debug info.
 2013-03-04 00:17:01 +01:00
Tim Hunt
d23edcf151 MDL-37932 formslib: setAdvanced for repeatelements. 
I think this commit also fixes some other problems with repeatelements
and shortforms. The shortforms code was trying to use hidden elements
with names like in conjunction with ...[0] with optional_param which
will not work. Hidden form fields that relate to other parts of the form
must use the other elements's id, no name, to make the hidden field
name.
 2013-03-01 11:41:59 +00:00
sam marshall
85cb4b65b1 MDL-38170 SimplePie: Cannot read https feeds through proxy 2013-03-01 10:36:51 +00:00
David Monllao
072f67fcac MDL-38026 behat: Base to write steps to work with specific DOM parts 2013-03-01 16:40:22 +08:00
David Monllao
46ac40cd0b MDL-38025 behat: Compliant with moodlechecker and codechecker 2013-03-01 16:07:04 +08:00