Dan Poltawski
e14bbecd57
Merge branch '45724-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-07-22 09:07:27 +01:00
Sam Hemelryk
9e32e3befc
Merge branch 'MDL-45594_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE
2014-07-22 11:12:13 +12:00
Sam Hemelryk
695553b1a5
Merge branch 'MDL-43063-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE
2014-07-22 09:49:07 +12:00
Dan Poltawski
c081554c0c
Merge branch '46335-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-07-21 09:59:08 +01:00
Dan Poltawski
b73aaa678c
Merge branch 'MDL-46370_26' of https://github.com/moodlerooms/moodle into MOODLE_26_STABLE
2014-07-21 09:54:59 +01:00
Damyon Wiese
47c938a31b
MDL-46017 Assign: Fix restore of marking workflow data
2014-07-21 16:39:01 +08:00
Simey Lameze
bad139d09d
MDL-43063 core: fix phpdoc comment codechecker issue.
2014-07-21 10:17:29 +08:00
Sam Hemelryk
3a8a3bc3f9
MDL-42909 course: fixed whitespace
2014-07-21 11:43:08 +12:00
Sam Hemelryk
e8b0dadd6b
Merge branch 'MDL-42909-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE
2014-07-21 11:35:50 +12:00
David Balch
4b2a23e36f
MDL-40479 mod_assign: Fix the colour of grading success messages.
2014-07-21 11:33:25 +12:00
Brian Barnes
294629be5f
MDL-46406 core_auth: Placed remember username before submit login form
2014-07-21 11:24:24 +12:00
Sam Hemelryk
2e8d176e27
Merge branch 'mdl-46427-m26' of git://github.com/deraadt/moodle into MOODLE_26_STABLE
2014-07-21 11:12:08 +12:00
Willy Lee
d8d64eef11
MDL-46159 course: Add search box to course management pages
2014-07-21 10:56:27 +12:00
Sam Hemelryk
997be8cd2d
Merge branch 'MDL-45339-26' of git://github.com/xow/moodle into MOODLE_26_STABLE
2014-07-21 10:49:29 +12:00
Sam Hemelryk
6958e7ebb0
Merge branch 'm26_MDL-46363' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE
2014-07-21 10:45:38 +12:00
Sam Hemelryk
a3f41f5840
Merge branch 'wip-mdl-46372-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE
2014-07-21 10:42:35 +12:00
Sam Hemelryk
f7a54f619a
MDL-45724 cache: added cache API warnings to the admin notifications page
2014-07-21 09:49:45 +12:00
Sam Hemelryk
7bc4ca8b88
MDL-45724 cache: admin screen now shows store warnings
...
Implemented a means by which cache store instance can communicate
warnings due to things such as conflicting configurations etc.
2014-07-21 09:39:41 +12:00
AMOS bot
1980338f38
Automatically generated installer lang files
2014-07-20 00:44:31 +00:00
AMOS bot
d7bd06bfde
Automatically generated installer lang files
2014-07-19 00:41:57 +00:00
Michael de Raadt
a74dd5b58c
MDL-46427 Course: Correcting dimmed course link class on profile pages.
2014-07-18 15:54:16 +08:00
Jason Fowler
8ed407023d
MDL-42909 Course: Fix title for move-targets
2014-07-18 14:43:11 +08:00
Mark Nelson
fef6a23626
MDL-34248 core_backup: used API instead of inserting into the log table directly
2014-07-17 18:34:29 -07:00
Mark Nelson
46ca4a9099
MDL-34248 core_backup: added missing end quotation
2014-07-17 18:13:29 -07:00
Jim Thorpe
9df4af3757
enrol_imsenterprise: MDL-46363 including course lib when create_course is
...
used
2014-07-18 11:26:14 +12:00
Sam Hemelryk
4a77758f38
MDL-46335 backup: fixed casting issue with setting labels
...
The issue was that clean_param took an int and returned a string
and the result was used in an exact comparison.
The type change mean the comparison failed.
The solution was to ensure the param was cast as a string.
2014-07-18 08:29:48 +12:00
John Okely
803d739f4a
MDL-45339 Libraries: Add a note to docblock of get_config, set_config, and unset_config to note they are used in lib/db/upgrade.php
2014-07-17 17:48:15 +08:00
Dan Poltawski
22ffc39685
weekly release 2.6.4+
2014-07-17 09:22:49 +01:00
Dan Poltawski
daf2f76125
Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE
2014-07-17 09:22:46 +01:00
AMOS bot
760bce86ea
Automatically generated installer lang files
2014-07-17 00:53:00 +00:00
AMOS bot
8fec45ebf0
Automatically generated installer lang files
2014-07-17 00:53:00 +00:00
Mark Nelson
23aab8e694
MDL-45594 core_message: added unit tests
2014-07-16 17:06:48 -07:00
Mark Nelson
e87c4986dd
MDL-45594 core_message: ordered recent notifications by timecreated
2014-07-16 17:06:48 -07:00
Tim Hunt
a62cfc3245
MDL-45594 simplify message_get_recent_conversations SQL
...
I am pretty sure that this new SQL is logically equivalent to
the original, and it passes Mark's unit tests. However, it is
hard to be 100% sure.
2014-07-16 17:06:47 -07:00
Sam Chaffee
01865c55bd
MDL-46370 Ajax and Javascript - Fixes docked blocks not expanding when using dock on right
2014-07-16 12:01:31 -06:00
Dan Poltawski
e9b7ea41c4
Revert "MDL-46226 core: pix_icon no longer sets title to the alt text"
...
This reverts commit b440662be2
.
2014-07-16 13:45:46 +01:00
Dan Poltawski
c82fa0c8ad
Revert "MDL-46226 fix unit tests"
...
This reverts commit 42f05b95c6
.
2014-07-16 13:45:45 +01:00
Rajesh Taneja
bab46e77d7
MDL-30431 behat: Fixed wiki behat
2014-07-16 09:19:05 +02:00
Eloy Lafuente (stronk7)
6aff5581f6
MDL-30431 mod_wiki: whitespace fix
2014-07-16 01:19:13 +02:00
Eloy Lafuente (stronk7)
5cefb82acb
Merge branch 'MDL-30431_wiki_comments_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE
2014-07-16 01:16:33 +02:00
Rajesh Taneja
9a24fe056e
Backport event trigger from MDL-45641
...
While backporting MDL-45641, event trigger was missed
on editadavnced page.
2014-07-15 11:46:17 +08:00
Eloy Lafuente (stronk7)
e60ca92e1d
Merge branch 'MDL-46080_26' of https://github.com/jonof/moodle into MOODLE_26_STABLE
2014-07-14 23:30:34 +02:00
Sam Hemelryk
522cbb467c
Merge branch 'MDL-42179-003-26' of https://github.com/dbezborodovrp/moodle into MOODLE_26_STABLE
2014-07-15 08:41:46 +12:00
Eloy Lafuente (stronk7)
d7a9bd9da7
Merge branch 'm26_MDL-31366' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE
2014-07-14 18:17:59 +02:00
Dan Poltawski
1aefe49544
Merge branch 'MDL-42752-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE
2014-07-14 16:09:28 +01:00
Dan Poltawski
42f05b95c6
MDL-46226 fix unit tests
2014-07-14 15:47:25 +01:00
Dan Poltawski
90e35c8929
Merge branch 'MDL-46218_disabled2_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE
2014-07-14 15:33:24 +01:00
Eloy Lafuente (stronk7)
674ce27e1b
Merge branch 'm26_MDL-46197' of https://github.com/totara/moodle into MOODLE_26_STABLE
2014-07-14 16:25:18 +02:00
Dan Poltawski
8bbc71406d
Merge branch 'm26_MDL-46226' of https://github.com/totara/moodle into MOODLE_26_STABLE
2014-07-14 15:15:07 +01:00
David Monllao
e946e06322
MDL-43390 files: Only lock when locking is not prevented
2014-07-14 13:04:59 +08:00