77ef5e06f9
Merge branch 'wip-mdl-30667-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
2012-09-13 11:18:20 +12:00
bd390545b1
Merge branch 'MDL-34082_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-09-12 17:20:48 +02:00
b06143c5c2
MDL-34082 course restrict modules: typo in MDL-19125 upgrade code.
2012-09-12 16:15:38 +01:00
6588886965
Merge branch 'MDL-34984_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
2012-09-11 16:30:44 +02:00
35eb1a0f0c
Merge branch 'MDL-35171_m23' of git://github.com/merrill-oakland/moodle into MOODLE_23_STABLE
2012-09-11 02:44:56 +02:00
f34cb5797c
Merge branch 'MDL-35257' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
2012-09-11 01:53:35 +02:00
919105e5d1
MDL-32785 - lib - Ignorning hard frozen fields when submitting data.
2012-09-11 10:48:07 +12:00
9cd1f8ffe6
MDL-35289 add missing charmap usage info string
2012-09-07 10:30:24 +02:00
689a3bcd17
MDL-34984 admin setting: fixed labeling and shortname display for admin setting
2012-09-07 15:43:09 +08:00
bd916ad1ee
MDL-35257 lib: if $CFG->logguests is disabled, avoid some log actions
...
This is for performance, else there can be great contention on the guest
user record as we've seen on moodle.org.
2012-09-07 10:24:50 +08:00
9d2926a4e9
MDL-6424 - blocks - Add missing global vars.
2012-09-06 19:45:00 +02:00
155fd3f64b
MDL-6424 - blocks - Adding a warning screen when the user clicks the delete link.
...
Conflicts:
lib/blocklib.php
2012-09-06 19:44:40 +02:00
e02955dd79
Merge branch 'MDL-35034-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
2012-09-06 01:18:40 +02:00
69a52e7c4f
Merge branch 'MDL-35089_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
2012-09-05 15:08:38 +08:00
a334d8f967
MDL-26504 blog: fixed SQL to add explicit casting
...
Conflicts:
lib/db/upgrade.php
version.php
2012-09-05 10:31:06 +08:00
3ac8fa663a
Merge branch 'MDL-34997-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
2012-09-05 00:52:43 +02:00
c62ccd747c
MDL-26504 blog: added upgrade code to remove orphan external blog posts
...
Conflicts:
lib/db/upgrade.php
version.php
2012-09-04 13:56:27 +08:00
5f015b62d4
Merge branch 'MDL-29662_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-09-04 01:14:18 +02:00
2b567e3687
Merge branch 'MDL-27818_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-09-04 01:07:51 +02:00
b9d24254bd
Merge branch 'MDL-35133_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2012-09-03 17:47:50 +02:00
e815aa8e04
Merge branch 'w36_MDL-35145_m23_guestdelete' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-09-03 16:18:15 +02:00
90c499dbca
Merge branch 'w36_MDL-35080_m23_weirdtables' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2012-09-03 17:12:32 +08:00
2f2242efa2
MDl-30667 Course: Maxbytes list will show current value, if it's lower then maxbytes
2012-09-03 14:44:23 +08:00
3d5df93b80
MDL-34997 - Allow shortened url youtu.be and y2u.be for Youtube filter
2012-09-03 14:12:03 +08:00
c128731d19
MDL-35034 Repository: Google Docs does not fail when download is restricted
2012-09-03 14:11:12 +08:00
8169e2f46b
Merge branch 'MDL-35109-available-updates_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE
2012-09-03 12:28:18 +12:00
9817f08400
MDL-35080 skip views and weird tables in mysql structure upgrades
2012-09-01 16:23:44 +02:00
e0b818cde0
MDL-35171 formslib Updating date config array to fix problems with month jumping.
...
Based on https://bugs.php.net/bug.php?id=49115 , if you request a month, but do not
specify a date, it will use your current date, which may be beyon a date in the month
requested, causing the return of the next month. This patch specifies the date (1st).
2012-09-01 10:14:51 -04:00
45f9c2db5f
MDL-35145 add basic unit tests for delete_user()
2012-09-01 14:15:36 +02:00
3fe8ae9bb9
MDL-35145 add extra delete_user() parameter validation
...
We do not want to delete local admins and guest account, we need to validate the supplied parameter is valid $user record and refetch it from database.
2012-09-01 14:15:28 +02:00
5d22b22274
MDL-27818 question bank: multilang category names don't work.
2012-08-30 22:45:51 +01:00
fd126f94aa
MDL-35133 accesslib: context_module::get_context_name should format_string
...
Otherwise activites with multilang names are displayed badly.
2012-08-30 22:44:20 +01:00
c8f9a0b63a
MDL-29662 quiz overrides: update dates during course reset.
...
Also, fix duplicate SQL clause in similar code in lib,
and fix error when saving overrides.
2012-08-29 18:43:00 +01:00
3afd86559e
Merge branch 'wip-MDL-34290-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE
2012-08-29 12:11:22 +02:00
accaf1d277
Merge branch 'wip-mdl-31623-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
2012-08-29 16:57:09 +08:00
0707372b03
MDL-34290 Added timeout to googledocs request to download a file
2012-08-29 13:12:06 +08:00
3dce698981
MDL-34290, MDL-33416 prepare to deprecate fields files.referencelastsync and referencelifetime
2012-08-29 13:12:06 +08:00
29ea4e9c56
MDL-34290 Auto synchronise newly created references when possible
2012-08-29 13:12:06 +08:00
f8dea58be9
MDL-34290 remove class cache_file as not used
...
in fact we have moodle filepool that can work perfectly for caching files, no need to create new class and storage
2012-08-29 13:12:05 +08:00
1d168fbd5f
MDL-34290 oauthlib_helper support for POST request
2012-08-29 13:12:04 +08:00
a6b0ac5362
MDL-34290 Allow to have several requests to the same instance of oauth_helper
2012-08-29 13:12:04 +08:00
a5fe04b62b
MDL-34290 repository_boxnet, boxlib use request timeouts
...
boxlib receives additional argument as request timeout
repository_boxnet::get_file_by_reference respects request timeouts and downloads file into moodle only if it is image
also some improvements to repository_boxnet source display functions;
also do not cache result of request in retrieving of listing, user is unable to see the new files he added to box.
2012-08-29 13:12:03 +08:00
9001c7242e
MDL-34290 repository API: add repository function to import referenced file
...
it must be independed from sync_external_file because sync often does not actually download contents, it is used just to retrieve
the size of the file. Besides the timeouts for get_file and sync requests are very different.
Also add option to send_stored_file() to ignore reference and send cached contents
2012-08-29 13:12:03 +08:00
3af509d6d4
MDL-34290 class oauth_helper, added API to pass options to curl (such as timeout)
2012-08-29 13:12:01 +08:00
26aaa7e835
MDL-34290 update all references after the source is changed
...
- When several records in {files} have the same record in {files_reference} and the synchronisation is performed, we need to update
all records in {files} so all files know if source is changed and that sync was performed;
- also when local moodle file content is changed we immediately update all files referencing to it (therefore sync of references
to the local files is unnecessary);
2012-08-29 13:12:00 +08:00
2e0b5fef48
MDL-34290 curl class: add functions to return error code and to download one file
2012-08-29 13:12:00 +08:00
903d13c0c2
MDL-35109 Fix available_update_checker::cron_has_fresh_fetch()
...
For the purpose of cron based fetching, recently fetched data are valid
for 24 hours.
2012-08-28 22:56:18 +02:00
b0e5b3b63b
MDL-35109 Improve unittests for cron based fetching of available updates
...
The expected behaviour is as follows:
* If the recently fetched data is older than 48 hours, it is considered
as outdated and the new fetch is executed
* else, if the recently fetched data is younger than 24 hours, it is
considered as fresh enough and no fetch is executed
* else, if the current time is after 01:00 AM plus a certain offset
(which is randomly generated for each site), the fetch is
executed.
2012-08-28 22:52:31 +02:00
5e143a271c
Merge branch 'MDL-34250_23' of github.com:stronk7/moodle into MOODLE_23_STABLE
2012-08-28 20:44:49 +02:00
ffbe597ef1
MDL-34250 navigation: Always look for correct parent context.
...
Conflicts:
lib/navigationlib.php
2012-08-28 20:41:21 +02:00
Sam Hemelryk