Dan Poltawski
29596525a3
Merge branch 'MDL-49504-master' of git://github.com/jleyva/moodle
...
Conflicts:
lib/db/services.php
version.php
2015-04-07 11:17:04 +01:00
Damyon Wiese
75ece778c5
Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2015-04-07 17:27:17 +08:00
Andrew Hancox
6398ff5387
MDL-49101 core: Add a global admin setting config->requiremodintro
...
Removed requiremodintro setting from all core activity plugins and replace
with a single global setting.
Deprecated moodleform_mod::add_intro_editor and replaced with
moodleform_mod::standard_intro_elements
2015-04-07 10:11:53 +01:00
Dan Poltawski
ffb4eaa93f
Merge branch 'MDL-49501-master' of git://github.com/jleyva/moodle
...
Conflicts:
lib/db/services.php
version.php
2015-04-07 10:03:28 +01:00
Andrew Nicols
78db0d13de
MDL-49395 core: add more unit tests for get_enrolled_sql
2015-04-07 15:30:07 +08:00
Andrew Nicols
78a9c50a74
Merge branch 'suspended_userids_memory' of git://github.com/tlevi/moodle
2015-04-07 15:30:04 +08:00
Damyon Wiese
006fac90a1
Merge branch 'MDL-49498-master' of git://github.com/jleyva/moodle
...
Conflicts:
lib/db/services.php
version.php
2015-04-07 14:27:20 +08:00
Dan Poltawski
3fa072a187
MDL-49684 time: fix unit tests broken by refactoring
2015-04-06 11:09:25 +01:00
Dan Poltawski
a671ebe866
Merge branch 'wip_MDL-49684_m29_tz2' of https://github.com/skodak/moodle
...
Conflicts:
version.php
2015-04-06 10:13:06 +01:00
Petr Skoda
d6e7a63d9a
MDL-49684 timezones: rewrite timezone support
...
This patch replaces all homegrown timezone
stuff with standard PHP date/time code.
The main change is the introduction of core_date
class that returns normalised user and server
timezones. From now on nobody should be using
$CFG->timezone or $user->timezone directly!
Other new features and fixes:
* admins are prompted for timezone during install
* editing of other users is finally fixed
* timezones are displayed in user profile
* new $this->setTimezone() in phpunit
* time locale is now automatically reset in phpunit
* timezone is now automatically reset in phpunit
* phpunit has Australia/Perth as default timezone
2015-04-06 13:53:51 +12:00
Petr Skoda
e19b37101f
MDL-49684 timezones: add BC unit test first
2015-04-04 11:56:44 +13:00
Brendan Heywood
894f36abf9
MDL-49740 Lock: Fixed task lock release bugs
2015-04-03 11:13:03 +11:00
Brendan Heywood
e8a1c3e908
MDL-49747 Task: Improve coding error expection message
2015-04-03 11:11:51 +11:00
Juan Leyva
6c785afa2d
MDL-49313 webservices: Fixes and add the function to the mobile service
2015-04-02 21:58:13 +02:00
Costantino Cito
90c326640d
MDL-49313 webservices: New WS get_course_completion_status
2015-04-02 21:58:13 +02:00
Costantino Cito
db5b697158
MDL-49347 rating: New external function core_rating_get_item_ratings
2015-04-02 17:13:44 +02:00
Juan Leyva
d508dfe79a
MDL-49503 forum: Add view_forum_discussion to the mobile service
2015-04-02 17:11:27 +02:00
Juan Leyva
7a334a9b7a
MDL-49498 user: Add core_user_view_user_list to the mobile service
2015-04-02 17:03:37 +02:00
Juan Leyva
a84f89ca23
MDL-49501 messages: Add mark_message_read to the mobile service
2015-04-02 17:02:19 +02:00
Juan Leyva
5770f10e0d
MDL-49499 user: Add core_user_view_user_profile to the mobile service
2015-04-02 17:01:02 +02:00
Juan Leyva
a80b551899
MDL-49504 notes: Add core_notes_view_notes to the mobile service
2015-04-02 16:46:04 +02:00
Juan Leyva
1bc85767b5
MDL-49500 grades: Add the new function to the mobile service
2015-04-02 16:41:40 +02:00
Eloy Lafuente (stronk7)
ac84f1f457
NOBUG: Fixed file access permissions
2015-04-02 11:48:43 +02:00
Ankit Agarwal
7ceee32454
MDL-49330 webservices: Fix get_course_notes api
2015-04-02 11:09:25 +02:00
Marina Glancy
f79747171d
MDL-46960 completion: trigger event after clearing cache
2015-04-02 11:08:22 +02:00
Brendan Heywood
bf08e3f94c
MDL-48887 An auth plugin hook enabling removal of redundant redirects
...
This introduces a new hook allowing an auth plugin to redirect to an
external login page directly without redundant redirects to the standard
login page first, or where possible to authenticate the user and simply
continue loading the page without any redirects. For some protocols such
as SAML reducing the number of redirects to the bare minimum greatly
speeds up the login process on high latency networks.
2015-04-02 11:08:20 +02:00
Eloy Lafuente (stronk7)
82cf09885c
Merge branch 'MDL-49686-master' of git://github.com/merrill-oakland/moodle
...
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2015-04-02 11:08:11 +02:00
Andrew Nicols
df15759724
Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle
2015-04-02 11:06:27 +02:00
Eloy Lafuente (stronk7)
605324fb10
Merge branch 'MDL-49330-master' of git://github.com/jleyva/moodle
...
Conflicts:
lib/db/services.php
version.php
2015-04-02 11:06:20 +02:00
Eloy Lafuente (stronk7)
f8da6281a0
Merge branch 'MDL-49314-master' of git://github.com/jleyva/moodle
2015-04-02 11:06:02 +02:00
Dan Poltawski
62d94d17d0
Revert "Merge branch 'MDL-37864' of https://github.com/serega1394/moodle "
...
This reverts commit 19ffcbe273
, reversing
changes made to 2112dd44e8
.
2015-04-02 11:05:45 +02:00
David Monllao
ee366cf907
Merge branch 'MDL-49587' of git://github.com/mike-grant/moodle
2015-04-02 11:05:43 +02:00
Dave Cooper
3004a92332
MDL-49534 libraries: Removed pear/HTTP/WebDav
2015-04-02 11:05:42 +02:00
Eloy Lafuente (stronk7)
b485fb20dd
Merge branch 'MDL-49693-master' of git://github.com/merrill-oakland/moodle
...
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2015-04-02 11:05:32 +02:00
Tony Levi
a7e4cff20a
MDL-49395 accesslib: Make get_suspended_userids more efficient
2015-04-02 13:53:49 +10:30
Costantino Cito
9857381dc3
MDL-49330 core_notes: New external function core_notes_get_course_notes
2015-04-01 10:44:45 +02:00
Juan Leyva
aa5faf0070
MDL-49314 groups: Unit tests for groups_user_groups_visible
2015-04-01 10:19:26 +02:00
Juan Leyva
c616c5f145
MDL-49314 groups: New API function groups_user_groups_visible
2015-04-01 10:19:26 +02:00
Juan Leyva
604afeff1c
MDL-49314 webservices: Add the new function to the mobile service
...
The commit also include some clean-up
2015-04-01 10:19:25 +02:00
Costantino Cito
5f2406c94a
MDL-49314 webservices: New WS get_activities_completion_status
2015-04-01 10:19:25 +02:00
Rajesh Taneja
bed97c39eb
MDL-49513 behat: Set admin config using php api
...
Added a new set to set config using set_config() api
to make steps faster and more efficient
2015-04-01 14:25:23 +08:00
David Monllao
7c5dbf0396
Merge branch 'MDL-49453-master' of git://github.com/jleyva/moodle
...
Conflicts:
lib/db/services.php
2015-04-01 11:59:33 +08:00
David Monllao
a647e1f053
Merge branch 'MDL-49502-master' of git://github.com/jleyva/moodle
...
Conflicts:
lib/db/services.php
2015-04-01 11:49:31 +08:00
David Monllao
0005ce8e4b
Merge branch 'MDL-49520-master' of git://github.com/gurgus/moodle
2015-04-01 11:13:28 +08:00
Andrew Nicols
2b53b13ff7
MDL-49627 core: Update uses of generate_image_thumbnail
...
This removes the need to write tempfiles in these locations.
2015-04-01 11:05:19 +08:00
Andrew Nicols
b7067f065e
MDL-49627 core: Improve thumbnail generation
...
We now abstract the actual file generation to a new function.
We are then able to call this function from the other image generation
sources. This allows us to generate thumbnails in a more efficient manner.
* Stored files stay as stored files and are not temporarily re-written to
disk;
* Strings containing an image remain as a variable and are not temporarily
written to disk; and
* Arbitrary files are not captured to string.
2015-04-01 11:05:19 +08:00
David Monllao
47d333857d
Merge branch 'MDL-23296-master' of git://github.com/FMCorz/moodle
2015-04-01 10:41:41 +08:00
Eloy Lafuente (stronk7)
e025f20995
Merge branch 'wip-mdl-48605' of https://github.com/rajeshtaneja/moodle
2015-04-01 01:09:25 +02:00
Dan Poltawski
2c92e06106
Merge branch 'MDL-49518-master' of git://github.com/gurgus/moodle
2015-03-31 20:04:54 +01:00
Dan Poltawski
19ffcbe273
Merge branch 'MDL-37864' of https://github.com/serega1394/moodle
2015-03-31 19:53:46 +01:00