Eloy Lafuente (stronk7)
895e16ff28
Merge branch 'w01_MDL-42797_m26_admin' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2014-01-08 02:10:36 +01:00
Eloy Lafuente (stronk7)
93073173ce
Merge branch 'MDL-43423_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-08 02:02:56 +01:00
Eloy Lafuente (stronk7)
5c283bb713
Merge branch 'wip-MDL-42310-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE
2014-01-08 01:52:12 +01:00
Dan Poltawski
e86b3c7335
Merge branch 'MDL-43173_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2014-01-08 08:21:09 +08:00
Eloy Lafuente (stronk7)
52d8541b5b
Merge branch 'm26_MDL-43508_Invalid_String_Identifier' of https://github.com/scara/moodle into MOODLE_26_STABLE
2014-01-08 00:46:13 +01:00
Eloy Lafuente (stronk7)
99a57908f5
Merge branch 'MDL-42607_rss_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE
2014-01-08 00:42:45 +01:00
Eloy Lafuente (stronk7)
ebe415f889
Merge branch 'MDL-42392-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2014-01-08 00:33:48 +01:00
Eloy Lafuente (stronk7)
f0d61c012d
Merge branch 'MDL-43451-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2014-01-07 23:38:28 +01:00
Dan Poltawski
d829440fed
Merge branch 'w01_MDL-43510_m26_test404' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2014-01-07 17:26:01 +08:00
Dan Poltawski
e57bc1637c
Merge branch 'm26_MDL-43482_Lot_Of_Passed_By_Reference_Messages' of https://github.com/scara/moodle into MOODLE_26_STABLE
2014-01-07 17:20:49 +08:00
Damyon Wiese
708e0804b8
Merge branch 'w01_MDL-43585_m26_userlib' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2014-01-07 13:33:53 +08:00
Damyon Wiese
3a8e16ecab
Merge branch 'MDL-43411-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2014-01-07 12:52:49 +08:00
Dan Poltawski
9fe6a6f42b
Merge branch 'm26_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Content' of https://github.com/scara/moodle into MOODLE_26_STABLE
2014-01-07 12:43:29 +08:00
Petr Škoda
7f5a384c99
MDL-43585 remove incorrect user/lib.php include
2014-01-07 12:16:34 +08:00
Dan Poltawski
836399115b
Merge branch 'MDL-42995-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-07 11:51:18 +08:00
Dan Poltawski
adb28ab708
Merge branch 'wip-mdl-43521-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE
2014-01-07 11:08:28 +08:00
Rajesh Taneja
c783a874f0
MDL-42643 course: Member in same group should only loginas
...
If course groupmode is set to SEPARATEGROUPS, and user doesn't have
site:accessallgroups capability than only allow user to loginas if
current user is in same group as loginas user
2014-01-07 11:05:27 +08:00
Dan Poltawski
883ea035af
Merge branch 'MDL-43394a-26' of https://github.com/srynot4sale/moodle into MOODLE_26_STABLE
2014-01-07 11:00:12 +08:00
Tony Butler
c56a930df8
MDL-43373 core_enrol: Display enrolments dimmed if outside of start or end times
2014-01-07 10:44:29 +08:00
Damyon Wiese
28abbabae5
Merge branch 'MDL-43448_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-01-07 09:22:15 +08:00
AMOS bot
2010db2cd4
Automatically generated installer lang files
2014-01-07 00:41:52 +00:00
Frederic Massart
bf6527407d
MDL-40705 theme_bootstrapbase: Handling of long words in block content
2014-01-06 15:45:19 +01:00
Frederic Massart
2424069da2
MDL-39661 blocks: Removed notice when moving a block
2014-01-06 12:44:23 +01:00
Frederic Massart
8d1293da86
MDL-43460 calendar: Decode event description links on restore
2014-01-06 11:46:56 +01:00
Frederic Massart
396b5cc75b
MDL-42995 mod_assign: Extended tests for update_calendar method
2014-01-06 10:32:06 +01:00
Frederic Massart
49a9cc9bd1
MDL-42995 mod_assign: Remove files from calendar event description
2014-01-06 10:32:00 +01:00
Frederic Massart
5bf8b2e969
MDL-42995 libraries: Global function to strip pluginfile content
2014-01-06 10:31:48 +01:00
Damyon Wiese
9ce83d0908
Merge branch 'MDL-43399-26' of git://github.com/mouneyrac/moodle into MOODLE_26_STABLE
2014-01-06 16:14:02 +08:00
Damyon Wiese
0f399f7f74
Merge branch 'MDL-43454-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-06 15:52:17 +08:00
Damyon Wiese
5726fe6263
Merge branch 'w01_MDL-36721_m26_passlog' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2014-01-06 14:51:16 +08:00
Dan Poltawski
e3e938b861
Merge branch '43349-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-01-06 14:21:45 +08:00
Rajesh Taneja
3dd7b4f805
MDL-42883 Administration: Check sessionkey before taking action on user profile fields
2014-01-06 13:58:59 +08:00
Tony Butler
cf3f46344e
MDL-43408 gradereport_grader: Display users with expired enrolments as inactive in grader report
2014-01-06 10:38:13 +08:00
Sam Hemelryk
0cb1903bfd
Merge branch 'MDL-35973_redirect_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE
2014-01-06 11:28:25 +13:00
Sam Hemelryk
8571b889f3
Merge branch 'MDL-43281-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2014-01-06 11:22:09 +13:00
Sam Hemelryk
ec9f2a7d3f
Merge branch 'MDL-42212-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-01-06 10:30:13 +13:00
Sam Hemelryk
97e9098927
Merge branch 'MDL-42801-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2014-01-06 10:20:39 +13:00
Andrew Davis
44b74479cb
MDL-35973 lib: added a page title to redirect() and added 2 seconds to the page redirection when posting in a forum
2014-01-05 20:08:05 +08:00
AMOS bot
6a4e20e239
Automatically generated installer lang files
2014-01-04 00:51:51 +00:00
David Monllao
adf125a30b
MDL-43173 behat: Thowing an exception if the JS is not ready
2014-01-03 11:29:56 +08:00
Rajesh Taneja
3db84ae082
MDL-43521 block_admin_bookmarks: Site admin node is of type TYPE_SITE_ADMIN
...
Since 2.6 Site admin node is of type TYPE_SITE_ADMIN, previously it was TYPE_SETTING
2014-01-03 10:47:39 +08:00
Michael Milette
025000a221
MDL-42310 feedback mod - Enable filtering of multichoice and multichoice rated controls
...
Conflicts:
mod/feedback/item/multichoice/lib.php
mod/feedback/item/multichoicerated/lib.php
Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
2014-01-03 10:30:11 +08:00
Andrew Davis
a90069245d
MDL-42607 mod_forum:fixed some inefficiencies in forum RSS generation
2014-01-02 10:50:54 +08:00
Petr Škoda
ddc72f06ef
MDL-42797 require real user login on upgrade settings page
2014-01-02 09:17:38 +08:00
Sam Hemelryk
55f4cb7299
MDL-43349 cache: init now checks store requirements are met
2014-01-02 09:22:42 +13:00
Petr Škoda
9d904936c8
MDL-42797 require real user login on admin page
2014-01-01 15:19:34 +08:00
Andrew Nicols
560672aaa1
MDL-43451 Cron: Retrieve additional name fields when creating passwords
2014-01-01 02:25:42 +08:00
Andrew Nicols
5aee2507d4
MDL-43281 Blocks: Retrieve a newly created block after creating it
...
Although we were previously creating the DOM markup for a block region if
it did not exist, we were not making use of it.
This change ensures that we make use of that block region as part of the
blocks code.
2014-01-01 02:20:15 +08:00
Andrew Nicols
1f5b61e1db
MDL-40119 Forms: Date selector should use images for the calendar popup toggle
...
The calendar popup toggle must use an image, rather than an input with type
of image as the latter is actually a form of submit button, and hence it
steals the focus away from the real submit button.
2013-12-30 15:54:42 +08:00
AMOS bot
c15270df73
Automatically generated installer lang files
2013-12-30 00:43:23 +00:00