74399 Commits

Author SHA1 Message Date
Andrew Nicols
050bfb3302 Merge branch 'wip-MDL-34938-master' of git://github.com/marinaglancy/moodle 2015-09-09 09:00:27 +08:00
Dan Poltawski
760e38d0f4 Merge branch 'MDL-50013-master' of git://github.com/jleyva/moodle 2015-09-08 15:21:27 +01:00
Dan Poltawski
e90783958c Merge branch 'MDL-50853-master' of git://github.com/jleyva/moodle 2015-09-08 13:37:35 +01:00
Dan Poltawski
7e0488ea54 Merge branch 'MDL-51194' of git://github.com/lazydaisy/moodle 2015-09-08 13:27:37 +01:00
Dan Poltawski
33001202d6 MDL-51132 course: add tag require 2015-09-08 13:22:54 +01:00
John Okely
fa5a3cdedc MDL-50709 groups: Prevent XSS in grouping description 2015-09-08 12:47:54 +02:00
Dan Poltawski
9e66dff06c Merge branch 'wip-MDL-51132-master' of https://github.com/marinaglancy/moodle 2015-09-08 10:46:38 +01:00
Dan Poltawski
0c05ec3b96 Merge branch 'wip-MDL-50323-master' of git://github.com/abgreeve/moodle 2015-09-08 09:14:14 +01:00
Dan Poltawski
07cc2db61b Merge branch 'MDL-51307-master' of git://github.com/cameron1729/moodle 2015-09-08 09:11:57 +01:00
Andrew Nicols
e5728db829 Merge branch 'MDL-51281-master' of git://github.com/jleyva/moodle 2015-09-08 14:07:27 +08:00
Andrew Nicols
1147c5a3d4 Merge branch 'MDL-51325-master' of git://github.com/jleyva/moodle 2015-09-08 12:51:30 +08:00
Cameron Ball
e683771623 MDL-51307 navigation: hide message button 2015-09-08 12:10:07 +08:00
Marina Glancy
5723dcdd85 MDL-34938 enrol_meta: sync enrolment start/end dates 2015-09-08 10:28:54 +08:00
Andrew Nicols
fd23f8e7b2 Merge branch 'MDL-51245' of git://github.com/stronk7/moodle 2015-09-08 09:24:00 +08:00
Adrian Greeve
4c607947b2 MDL-50323 themes: Course unordered lists correctly styled.
Thank you to Ann Adamcik for providing this patch.
2015-09-08 09:23:40 +08:00
Eloy Lafuente (stronk7)
48657a6713 MDL-51245 sqlsrv: Diagnose missing READ_COMMITTED_SNAPSHOT mode
Without it, transactions are executed in standard READ_COMMITED
mode, without snapshoting/row versioning, leading to update
conflicts under high concurrency.
2015-09-08 02:55:53 +02:00
Eloy Lafuente (stronk7)
a9daab4927 MDL-51245 mssql: Diagnose missing READ_COMMITTED_SNAPSHOT mode
Without it, transactions are executed in standard READ_COMMITED
mode, without snapshoting/row versioning, leading to update conflicts
under high concurrency.
2015-09-08 02:55:45 +02:00
Andrew Nicols
ebdfde7664 Merge branch 'MDL-50287-master' of git://github.com/danpoltawski/moodle 2015-09-08 08:18:03 +08:00
Petr Skoda
e4ac3879c2 MDL-50860 core: improve creation of random strings 2015-09-08 01:07:37 +02:00
Tim Lock
d89dc6daa5 MDL-42670 mod_assign: Fix recent activity block when blind marking is on 2015-09-07 22:41:41 +02:00
Marina Glancy
f06d8d94a1 MDL-50744 enrol_meta: fix incorrect role assign 2015-09-07 10:29:02 +01:00
Adrian Greeve
40a154551f MDL-48371 editors: Option for removing managefiles
We want to remove the managefiles button from the
editors in the wiki so that students don't delete
each others files.
2015-09-07 09:59:35 +01:00
Marina Glancy
0d1e545612 MDL-51132 tags: do not use user tags for tagging courses 2015-09-05 11:21:15 +08:00
lazydaisy
3278fd77f2 MDL-51194 theme_bootstrapbase: Move CSS classes from /less/moodle.less 2015-09-04 22:46:59 +01:00
Juan Leyva
6c9b2bb5fe MDL-50013 mod_book: New WS mod_book_view_book 2015-09-04 11:18:10 +02:00
Juan Leyva
1af52267d3 MDL-50013 mod_book: Move logging and completion to new API 2015-09-04 11:17:39 +02:00
Juan Leyva
edf6db6547 MDL-51281 completion: Fixed incorrect returned parameter type
Parameter status in external function get_course_completion_status
2015-09-04 11:14:03 +02:00
Juan Leyva
c7697399d1 MDL-51325 notes: Fix external get_course_notes to return site notes 2015-09-04 11:05:08 +02:00
Dan Poltawski
1dabedeedf weekly release 3.0dev 2015-09-03 12:31:49 +01:00
Dan Poltawski
4837c7e472 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-09-03 12:31:47 +01:00
rajesh Taneja
58031eea30 MDL-51090 behat: switch to main window 2015-09-03 10:26:33 +01:00
Damyon Wiese
7cf70b0d97 MDL-38763 roles: Fix example context for mustache templates. 2015-09-03 10:19:21 +02:00
Ryan Wyllie
c47f3803f1 MDL-49536 theme_clean: update help text for logo
Updated the help text on the theme settings page to
mention that the theme logo will only be displayed on
the front page and login page.

Conflicts:
	theme/upgrade.txt
2015-09-03 10:19:20 +02:00
Marina Glancy
e6acf72970 MDL-50919 behat: temporary fix until behat learns to wait for JQuery 2015-09-03 10:19:20 +02:00
Eloy Lafuente (stronk7)
e45f622b8e Merge branch 'MDL-29801_master' of git://github.com/markn86/moodle 2015-09-02 19:19:27 +02:00
Juan Leyva
cdb5d405c1 MDL-50853 mod_chat: Unit tests for the external lib 2015-09-02 17:26:05 +02:00
Juan Leyva
5841b9d5d3 MDL-50853 mod_chat: New Web Service mod_chat_view_chat 2015-09-02 17:23:43 +02:00
Juan Leyva
8380bc7fc0 MDL-50853 mod_chat: New Web Service mod_chat_get_chat_latest_messages 2015-09-02 17:23:42 +02:00
Juan Leyva
874aa80f67 MDL-50853 mod_chat: New Web Service mod_chat_send_chat_message 2015-09-02 17:23:41 +02:00
Juan Leyva
e4076a6e4c MDL-50853 mod_chat: New Web Service mod_chat_get_chat_users 2015-09-02 17:23:40 +02:00
Juan Leyva
1ca4cdf3e9 MDL-50853 mod_chat: New Web Service mod_chat_login_user 2015-09-02 17:16:13 +02:00
Eloy Lafuente (stronk7)
8a6900ff56 MDL-50919 tags: minor fixes and version bump
This fixes:
- An incorrect exception message.
- tablelib weird behavior creating up to
  pagesize empty rows.

Also forces a version bump so new webservices will become installed.
2015-09-02 13:25:44 +02:00
Eloy Lafuente (stronk7)
544be5ad4d Merge branch 'wip-MDL-50919-master' of https://github.com/marinaglancy/moodle 2015-09-02 11:42:11 +02:00
Mark Nelson
9cf81a1a16 MDL-29801 core_message: added behat test for deleting messages 2015-09-02 01:45:51 -07:00
Mark Nelson
36d29c089c MDL-29801 core_message: added ability to delete messages
Thanks goes to Jetha for providing the HTML and CSS.
2015-09-02 01:31:17 -07:00
Mark Nelson
4582308508 MDL-29801 core_message: added delete message caps 2015-09-02 01:29:41 -07:00
Dan Poltawski
b85e8b747c Merge branch 'MDL-50891_master-unit-test-fix' of git://github.com/dmonllao/moodle 2015-09-02 09:23:07 +01:00
Tim Hunt
6b3bd52fae MDL-51090 question manual grading: fixing for testing issues 2015-09-02 15:09:34 +08:00
Marina Glancy
ef4c23ccd2 MDL-50919 tags: new WS core_tag_get_tags 2015-09-02 14:15:16 +08:00
Marina Glancy
8e35585390 MDL-50919 tags: new UI for managing tags 2015-09-02 14:15:13 +08:00