moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56070 commits 37 branches 540 tags 1.3 GiB
Commit graph

14173 commits

Author SHA1 Message Date
Dan Poltawski
139d3639c8 Merge branch 'MDL-33582-master-integration' of git://github.com/FMCorz/moodle 2012-06-19 15:39:03 +08:00
Dan Poltawski
a80b5a0cf0 MDL-32908 - drop $USER->ajax 
Its not been respected for some time and is just confusing
 2012-06-19 15:07:18 +08:00
Aparup Banerjee
1ee9b37880 Merge branch 'wip-MDL-32990-master' of git://github.com/phalacee/moodle 2012-06-19 14:59:48 +08:00
Jason Fowler
9e9382530f MDL-32990 - Repositories - Updating Box.net API calls to use HTTPS 2012-06-19 14:46:44 +08:00
Frederic Massart
4954d6ed2c MDL-33814 Output renderers: table cell objects are only created when needed 2012-06-19 11:59:03 +08:00
Marina Glancy
1778f310f3 MDL-33417 Show reference icon for files in filepicker 2012-06-19 11:15:51 +08:00
Sam Hemelryk
2395a7510f MDL-33825 css_optimiser: Fixed bug where !important was being lost for advanced background styles 2012-06-19 12:32:56 +12:00
Sam Hemelryk
624ef76c2f MDL-33811 Fixed left over debugging code preventing proper setting of YUI gallery version 2012-06-19 11:26:23 +12:00
Eloy Lafuente (stronk7)
e04a0e32c7 Merge branch 'MDL-33552' of git://github.com/danpoltawski/moodle 2012-06-18 12:31:37 +02:00
Dan Poltawski
6855fec7fd Merge branch 'MDL-33136_dndfilemanager_replace_file' of git://github.com/davosmith/moodle 2012-06-18 17:36:03 +08:00
Aparup Banerjee
44b836d629 Merge branch 'MDL-33175' of git://github.com/danpoltawski/moodle 2012-06-18 17:14:11 +08:00
Dan Poltawski
3248a1e1e4 Merge branch 'MDL-33794' of git://github.com/stronk7/moodle 
Conflicts:
	mod/assign/version.php
 2012-06-18 16:08:39 +08:00
Aparup Banerjee
341d989d63 Merge branch 'MDL-30337_no_risk' of git://github.com/nebgor/moodle 2012-06-18 16:03:08 +08:00
Davo Smith
d0b2d44528 MDL-33136 Dndupload filemanager - user asked to rename/overwrite file when droping file with existing name 2012-06-18 08:55:41 +01:00
Andrew Davis
448c2f5b9b MDL-27156 repositories: altered filepicker.php so that users with the ability to ignore course file size restrictions are not incorrectly restricted 2012-06-18 11:33:28 +07:00
Rajesh Taneja
4e782b32f3 MDL-33425 user: Replaced filepicker with filemanager on edit profile page 2012-06-18 10:19:48 +08:00
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Petr Skoda
d8bf2a14b6 MDL-32003 last db related phpdocs cleanup commit 2012-06-17 22:56:30 +02:00
Petr Skoda
002252f714 MDL-32003 standardise null case 2012-06-17 22:56:30 +02:00
Petr Skoda
aaddfac50c MDL-32003 more xmldb phpdocs and PHP4-ism cleanup 2012-06-17 22:56:30 +02:00
Petr Skoda
a6d9d4efc2 MDL-32003 fix PHP4-isms in core xmldb code 2012-06-17 22:56:29 +02:00
Petr Skoda
ef7c3f108a MDL-32003 protect xmldb class internals 
Use getters and setters instead!
 2012-06-17 22:56:29 +02:00
Petr Skoda
01be2287c7 MDL-32003 drop unused statement constants 
These were last used in 2.2 upgrade, not allowed any more.
 2012-06-17 22:56:29 +02:00
Petr Skoda
94417438b3 MDL-32003 fix phpdocs in xmldb abstraction 2012-06-17 22:56:28 +02:00
Petr Skoda
5a070f0477 MDL-32003 fix phpdocs in DDL layer 2012-06-17 22:56:28 +02:00
Petr Skoda
00902cd974 MDL-32003 fix phpdocs and use __DIR__ for includes in dml layer 
DML layer is not supposed to use $CFG,
it is better to rely on __DIR__ in self-contained libs…
 2012-06-17 22:56:28 +02:00
Eloy Lafuente (stronk7)
a4b9f21e45 MDL-27156 maxfilesize: Comment out new cap use + return -1 as temp fix 
With the capability check and the return -1 commented
it has been checked here that it's possible to upload
and pick from filesystem repository files normally, so
I'm introducing this temp commit to allow people to
use those repos "normallly" until a proper fix arrives
supporting the new cap.
 2012-06-15 20:05:46 +02:00
Eloy Lafuente (stronk7)
b9647509d4 MDL-32279 filters: filters: setup() before filter() is better. 2012-06-15 10:12:53 +02:00
Dongsheng Cai
d6453211b6 MDL-33513: Make files->source field consistent 2012-06-15 14:51:07 +08:00
Marina Glancy
52474d7497 MDL-33136 upload dnd files one after another 2012-06-15 14:48:02 +08:00
Dan Poltawski
ed2ed3f97e MDL-33468 - fix illegal whitespace 2012-06-15 12:17:40 +08:00
Dan Poltawski
74ef0474fc Merge branch 'wip-MDL-33468-m23' of git://github.com/samhemelryk/moodle 2012-06-15 12:14:49 +08:00
Dan Poltawski
b44022782b MDL-32279 filter: fix undefined variable 2012-06-15 11:58:03 +08:00
Dan Poltawski
ccd4972636 Merge branch 'MDL-33758-master-integration' of git://github.com/FMCorz/moodle 2012-06-15 11:30:33 +08:00
Dan Poltawski
66d9586070 Merge branch 'MDL-32279' of git://github.com/stronk7/moodle 2012-06-15 11:02:47 +08:00
Frederic Massart
e7ae9c2600 MDL-33758 Filepicker: using iframe instead of popup windows for download 2012-06-15 10:12:57 +08:00
Eloy Lafuente (stronk7)
6c5dbbb36b MDL-32279 filters: add support for setup() methods in filters. 2012-06-14 20:02:20 +02:00
Andrew Robert Nicols
605f92ca1d MDL-33729 Ensure that the cancel_popup event is correctly called when using the [x] button on a chooser 2012-06-14 14:46:24 +01:00
Aparup Banerjee
6971dcf7ec Merge branch 'wip-MDL-33596-m23' of git://github.com/samhemelryk/moodle 2012-06-14 21:09:55 +08:00
Andrew Robert Nicols
7db27680f8 MDL-33728 Ensure that chooser dialogues are centred vertically 2012-06-14 10:55:16 +01:00
Aparup Banerjee
60d3ff94db Merge branch 'MDL-31499-master-iframe' of git://github.com/FMCorz/moodle 2012-06-14 17:08:18 +08:00
Dan Poltawski
4585e6ac98 Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle 2012-06-14 16:23:08 +08:00
Marina Glancy
6fd1cf05b0 MDL-33550 reset repository static cache between unit tests 2012-06-14 16:21:04 +08:00
Frederic Massart
247804bcc2 MDL-33582 Filepicker: set main file button disabled when not required 2012-06-14 15:14:57 +08:00
Marina Glancy
cfc4db405c MDL-33550 Set default status for file =0 and correct setting user in phpunit test 2012-06-14 14:52:31 +08:00
Dan Poltawski
414ce30812 Revert MDL-33513 
This reverts commit b2cf2b807f.
This reverts commit 24b96f0170.
This reverts commit 39c60294a6.
This reverts commit 8a288971e2.
 2012-06-14 13:57:45 +08:00
Sam Hemelryk
1875b6fb89 MDL-33468 css_optimiser: Coding style clean up and renamed cssslib_test => csslib_test 2012-06-14 17:28:26 +12:00
Sam Hemelryk
de3a460e17 MDL-33468 css_optimiser: Fixed aggressive optimisation so that it only combines siblings and doesn't reorder 2012-06-14 17:25:19 +12:00
Dan Poltawski
bc1f298b2a MDL-33175 - filemanager: make dndupload icon clickable 2012-06-14 13:25:05 +08:00
Dan Poltawski
745b178e42 Merge branch 'wip-MDL-33592-m23' of git://github.com/samhemelryk/moodle 2012-06-14 12:22:39 +08:00