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

59456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dc8e7116a7 Merge branch 'wip-MDL-37901_master' of git://github.com/gjb2048/moodle 2013-03-05 15:23:46 +13:00
Aparup Banerjee
b4f110f1a4 Merge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle 2013-03-05 10:21:25 +08:00
Sam Hemelryk
aa9f48ed59 Merge branch 'MDL-38298' of git://github.com/stronk7/moodle 2013-03-05 15:12:08 +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)
caa5bcea00 Merge branch 'wip-MDL-38247-m25' of git://github.com/samhemelryk/moodle 2013-03-05 01:08:23 +01:00
Eloy Lafuente (stronk7)
fd0c485584 Merge branch 'm25_MDL-37515_Notice_when_submitting_change_password_form' of https://github.com/scara/moodle 2013-03-05 01:03:26 +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)
62bf37d8f5 Merge branch 'master_MDL-37907' of git://github.com/danmarsden/moodle 2013-03-05 00:46:12 +01:00
Eloy Lafuente (stronk7)
d2be039c6e MDL-32975 mini-bump to get navsortmycoursessort defined. 2013-03-04 23:47:13 +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
ed2703290c Merge branch 'MDL-38101-master' of git://github.com/sammarshallou/moodle 2013-03-05 09:30:02 +13:00
Sam Hemelryk
cf7386139d MDL-31983 navigation: fixed copy+paste typo 2013-03-05 09:24:19 +13:00
Eloy Lafuente (stronk7)
1de87afc24 Merge branch 'MDL-37522-published-attachment' of git://github.com/mudrd8mz/moodle 2013-03-04 20:46:41 +01: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)
bb8f31dbf3 MDL-31390 document the set_source_table() api change. 2013-03-04 18:18:09 +01:00
Eloy Lafuente (stronk7)
5a341e9183 Merge branch 'MDL-31390-m' of git://github.com/andrewnicols/moodle 2013-03-04 18:08:54 +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)
266e8dec49 Merge branch 'wip-MDL-37983-master' of git://github.com/abgreeve/moodle 2013-03-04 16:42:25 +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
486f9dbecc Merge branch 'MDL-38243-master' of git://github.com/lucisgit/moodle 2013-03-04 16:25:50 +13:00
Sam Hemelryk
5722822302 Merge branch 'MDL-35350' of git://github.com/rwijaya/moodle 2013-03-04 16:13:09 +13:00
Sam Hemelryk
1668803ae2 Merge branch 'MDL-35127-master' of git://github.com/damyon/moodle 2013-03-04 16:08:08 +13:00
Eloy Lafuente (stronk7)
15d427c82d Merge branch 'wip-MDL-38205-m25' of git://github.com/samhemelryk/moodle 2013-03-04 03:01:11 +01:00
Frederic Massart
31581ae65d MDL-36426 repository: Prevent login_as() users to access private repositories 2013-03-04 02:38:35 +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
7171c61c40 Merge branch 'MDL-36128-master' of https://github.com/StudiUM/moodle 2013-03-04 13:59:58 +13:00
Frederic Massart
ce96f23fe1 MDL-37681 repository_webdav: improved form handling when configuring an instance 2013-03-04 13:55:53 +13:00
Rajesh Taneja
9fd0cb9cb1 MDL-37338 Calendar: User will not see calendar subscription, which he/she can't edit 
Signed-off-by: Rajesh Taneja <rajesh@moodle.com>
 2013-03-04 01:49:02 +01: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
Dan Marsden
c238e1e2ab MDL-37907 Participants layout - move checkbox to first column 2013-03-04 11:28:14 +13:00
Frederic Massart
3ecc63e9db MDL-37481 user: fixed bug when logged in as guest 2013-03-04 11:17:14 +13:00
Eloy Lafuente (stronk7)
52f0c094f5 Merge branch 'wip-MDL-38165-m25' of git://github.com/samhemelryk/moodle 2013-03-03 23:08:15 +01:00
Sam Hemelryk
f0abd36e46 Merge branch 'MDL-32125-master' of git://github.com/StudiUM/moodle 2013-03-04 10:37:51 +13:00
Eloy Lafuente (stronk7)
045c0e4d8f MDL-38298 Take out harcoded dependency + tests. 
With that change the filte_emoticon will be easily
resusable by other "emoticon filters".
 2013-03-03 19:10:09 +01:00
Andrew Davis
ec7298a10f MDL-38149 core_grade: added a guard for when there are no old grades 2013-03-03 11:08:37 +08:00
Gareth J Barnard
dafa91279f MDL-37901 format_topics & format_weeks: Fix drag icon tooltip after move. 2013-03-02 12:38:29 +00: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