David Monllao
f822840223
MDL-37458 testing tests finder externalization
2013-01-17 15:15:27 +08:00
Ankit Agarwal
e73b527c82
MDL-36621 calendar: cache calendar subscriptions and showicalsource setting
...
Now MUC is used to cache subscription information when the constructor for an event is called, which is child of a ical subscription.
A new setting calendar_showicalsource is introduced which controls if the ical source should be displayed along with events in the calendar
Also minor changes has been done in places to make sure subscription id is always associated with ical events
2013-01-17 13:40:06 +08:00
Rossiani Wijaya
a170cdf4a4
MDL-35817 login: convert html tag to use html_writer and change <a> tag id to be more specific to login
2013-01-17 13:01:27 +08:00
Frederic Massart
caf16a57e5
MDL-29749 files: Improved params PARAM_PATH and PARAM_FILE
...
The logic change here allows for multiple dots to be part
of a file name or folder name. Most Unit Tests have not
been altered and reflect the exact logic as it was before.
2013-01-17 11:32:59 +08:00
Sam Hemelryk
e17dbeeb1a
MDL-34398 groups: implemented caching of group information.
2013-01-17 09:24:58 +13:00
Eloy Lafuente (stronk7)
937ad8c626
Merge branch 'MDL-37555' of git://github.com/stronk7/moodle
2013-01-16 20:52:47 +01:00
Tim Hunt
67cc80197f
MDL-31616 blocks: ensure showinsubcontexts is only 0 or 1 in the DB.
2013-01-16 19:16:09 +01:00
Eloy Lafuente (stronk7)
c6523d2f94
MDL-37555 Apply realpath() 2 CFG->phpunit_dataroot
2013-01-16 16:15:56 +01:00
David Monllao
3f7211f45a
MDL-37458 testing lock externalization
2013-01-16 13:43:25 +08:00
Sam Hemelryk
20a3199397
Merge branch 'wip-mdl-35873' of git://github.com/rajeshtaneja/moodle
2013-01-16 18:22:04 +13:00
Dan Poltawski
7acc743f06
Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle
2013-01-16 13:19:36 +08:00
Rossiani Wijaya
b3e02098a4
MDL-36553: Admin settings: remove border attribute from HTML settings table
2013-01-16 13:15:40 +08:00
Marina Glancy
a3f66bdeac
MDL-36968 Move function print_recent_activity() to the block recent_activity
2013-01-16 16:13:04 +11:00
Dan Poltawski
856df69f3d
Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle
2013-01-16 11:39:03 +08:00
Frederic Massart
212dac2724
MDL-36708 files: Fixed missing key in array
2013-01-16 11:28:14 +08:00
Dan Poltawski
0f94289c1d
Merge branch 'MDL-33688_dndupload_progress' of git://github.com/davosmith/moodle
...
Conflicts:
files/renderer.php
lib/outputrenderers.php
2013-01-16 11:18:18 +08:00
Eloy Lafuente (stronk7)
3431860f54
Merge branch 'w02_MDL-36988_m25_switchrole' of git://github.com/skodak/moodle
2013-01-16 02:27:48 +01:00
Eloy Lafuente (stronk7)
0c198a1b59
Merge branch 'w02_MDL-37429_m25_zippacker' of git://github.com/skodak/moodle
...
Conflicts:
lib/upgrade.txt
2013-01-16 02:22:26 +01:00
Eloy Lafuente (stronk7)
06d78e8209
Merge branch 'MDL-36257-master' of git://git.luns.net.uk/moodle
2013-01-16 02:05:27 +01:00
Eloy Lafuente (stronk7)
a91350609e
Merge branch 'wip-MDL-34344-m25' of git://github.com/samhemelryk/moodle
...
Conflicts:
lib/db/caches.php
2013-01-16 01:08:26 +01:00
Sam Hemelryk
3909faf45a
MDL-23504 admin: fixed whitespace issue
2013-01-16 12:00:37 +13:00
Sam Hemelryk
e265716f69
Merge branch 'wip-mdl-23504' of git://github.com/rajeshtaneja/moodle
2013-01-16 11:06:39 +13:00
Sam Hemelryk
00ba185d52
Merge branch 'wip-MDL-36967-master' of git://github.com/marinaglancy/moodle
...
Conflicts:
lib/deprecatedlib.php
2013-01-16 11:01:16 +13:00
Eloy Lafuente (stronk7)
d9b9d22fa1
Merge branch 'MDL-37173-m' of git://github.com/andrewnicols/moodle
2013-01-15 21:56:13 +01:00
Eloy Lafuente (stronk7)
493d8f781c
Merge branch 'MDL-37354-master' of git://github.com/mouneyrac/moodle
...
Conflicts:
message/tests/externallib_test.php
2013-01-15 21:50:31 +01:00
Petr Škoda
aae028d9e3
MDL-36988 cleanup role switching
...
This patch uses local URLs in parameters because it is more compatible
with various security hacks. Session key is not added automatically to
return url for safety reasons - we do not want to execute some random
action again. POST pages are now returned to course page too.
2013-01-15 21:44:20 +01:00
Petr Škoda
3cb856c744
MDL-37429 document zip packer improvements
2013-01-15 20:45:36 +01:00
Eloy Lafuente (stronk7)
ee5c647e84
Merge branch 'MDL-31616' of git://github.com/timhunt/moodle
2013-01-15 20:14:03 +01:00
Eloy Lafuente (stronk7)
fcdc9b7717
NOBUG: 1 more whitespace, was hurting my eyes all the time.
2013-01-15 19:20:17 +01:00
Andrew Robert Nicols
d7d68b03ee
MDL-37426 Fix JSHint issues for moodle-core-formchangechecker
2013-01-15 17:34:04 +00:00
Eloy Lafuente (stronk7)
ceda80962c
Merge branch 'MDL-37395-master' of git://github.com/sammarshallou/moodle
2013-01-15 18:17:12 +01:00
Eloy Lafuente (stronk7)
62a9604677
Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle
2013-01-15 18:12:20 +01:00
Eloy Lafuente (stronk7)
dfcb38a1c7
Merge branch 'wip-MDL-37207-master' of git://github.com/marinaglancy/moodle
2013-01-15 18:00:17 +01:00
Dan Poltawski
2773aa41de
Merge branch 'MDL-30070-master' of git://github.com/FMCorz/moodle
2013-01-15 16:04:57 +08:00
Frederic Massart
d6731600c8
MDL-30070 message: Web Services for contact list
2013-01-15 16:04:00 +08:00
Rossiani Wijaya
c316c3944e
MDL-35817 Login: set page focus to error message for login error
2013-01-15 15:45:15 +08:00
Dan Poltawski
2429051d2f
Merge branch 'MDL-37381-master' of git://github.com/mouneyrac/moodle
2013-01-15 14:29:41 +08:00
Dan Poltawski
0efd8de527
Merge branch 'w02_MDL-36898_m25_ccontact' of git://github.com/skodak/moodle
2013-01-15 13:57:39 +08:00
Dan Poltawski
09ade47f55
Merge branch 'MDL-36708-master' of git://github.com/FMCorz/moodle
2013-01-15 13:55:50 +08:00
Dan Poltawski
85533e2a03
Merge branch 'MDL-37077-master' of git://github.com/ankitagarwal/moodle
2013-01-15 13:54:40 +08:00
Frederic Massart
7aff468346
MDL-36708 files: Checking the size limit of a draft area does include references
2013-01-15 13:48:05 +08:00
Ankit Agarwal
5e1350abaa
MDL-37077 webservices: Define the ws api method for deleting calendar events
2013-01-15 13:23:13 +08:00
Dan Poltawski
8b16bbfc68
Merge branch 'MDL-35556d' of git://github.com/srynot4sale/moodle
2013-01-15 13:15:31 +08:00
Dan Poltawski
cc1521f57b
Merge branch 'MDL-37355-master' of git://github.com/mouneyrac/moodle
2013-01-15 13:11:46 +08:00
Dan Poltawski
27885779bc
Merge branch 'MDL-36991-master' of git://github.com/sammarshallou/moodle
2013-01-15 13:06:10 +08:00
Dan Poltawski
37f3f3ac73
Merge branch 'wip-MDL-30316-master' of git://github.com/phalacee/moodle
2013-01-15 12:46:44 +08:00
Dan Poltawski
aa452f97e3
Merge branch 'MDL-29835_master' of git://github.com/pauln/moodle
2013-01-15 12:41:13 +08:00
Dan Poltawski
28cfdfe180
Merge branch 'MDL-37366-master' of git://github.com/andrewnicols/moodle
2013-01-15 12:10:10 +08:00
Sam Hemelryk
c8d3475e17
Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle
2013-01-15 16:30:36 +13:00
Erik Lundberg
af7e05d6cc
MDL-34436 - Blogs - Adding event triggers when adding a new entry, editing an entry or remove an entry.
2013-01-15 11:29:12 +08:00