0575c5ad8c
Merge branch 'MDL-52204-master' of git://github.com/danpoltawski/moodle
2015-12-07 16:30:38 +08:00
f20abd8759
Merge branch 'MDL-52304_master' of https://github.com/dmonllao/moodle
2015-12-07 08:20:10 +00:00
8f4662a807
MDL-52271 install: don't allow installer to be indexed
...
Following guidance from:
https://support.google.com/webmasters/answer/93710?hl=en
2015-12-07 15:42:11 +08:00
bf5bbe0127
MDL-50540 mod_glossary: Final clean up of new external function
2015-12-07 13:42:37 +08:00
23da998fad
MDL-50540 glossary: New WS mod_glossary_get_glossaries_by_courses
2015-12-07 12:48:27 +08:00
04cd8ae3c0
MDL-52165 mod_forum: New Web Service mod_forum_can_add_discussion
2015-12-04 15:30:16 +01:00
23cbaefb24
MDL-50550 wiki: New WS mod_wiki_get_wikis_by_courses
2015-12-04 13:52:41 +01:00
f992dcf6e8
MDL-52204 js: fix 'used before defined' errors
...
Newer versions of jshint detect this coding error, we fix it
by simply reordering the definition of methods.
2015-12-04 11:43:10 +00:00
27635149d5
MDL-52304 media: Allow full screen in Flash player
2015-12-04 10:06:14 +08:00
a75f1dbc4f
MDL-50258 themes: Fix CSS source maps
2015-12-04 09:02:16 +08:00
288c8cb7f1
MDL-52261 filelib: Do login check for files in blocks
2015-12-04 11:00:05 +11:00
ef53650e8a
NOBUG: Fixup commit to fix stuff wrongly changed on merge commits
...
On rewriting MDL-47491, we ended in a situation where these
modifications had been incorporated via merge commits. And kept
undetected by rebase -ip.
In general, please, use merge commits only for solving conflicts,
never as a replacement for fixup commits. To fix non-conflicting
things, add new, proper, fixup commits.
2015-12-03 18:52:25 +01:00
53907dbee5
Merge branch 'MDL-51700-master' of git://github.com/FMCorz/moodle
2015-12-03 18:52:21 +01:00
200ab5266a
Merge branch 'MDL-50269_master' of git://github.com/markn86/moodle
...
Conflicts:
lib/upgrade.txt
2015-12-03 18:51:42 +01:00
4ebdd15487
MDL-51483 lib/moodlelib.php: Added conditional checks to shorten_text
2015-12-03 10:00:08 -06:00
bc7b1a3d4d
MDL-52399 webservice: Add core_notes_delete_notes to the mobile service
2015-12-03 13:02:56 +01:00
b4153ff09d
Merge branch 'wip-MDL-51985-master' of https://github.com/marinaglancy/moodle
2015-12-03 11:16:34 +01:00
40cd9f9ac9
Merge branch 'MDL-45364-master' of git://github.com/danpoltawski/moodle
2015-12-03 11:16:33 +01:00
b80ede13a6
MDL-51664 externalib: clarify crucial comment
2015-12-03 11:16:32 +01:00
50901a53bc
Merge branch 'MDL-51664-master' of git://github.com/FMCorz/moodle
2015-12-03 11:16:30 +01:00
551088fcd7
MDL-52292 testing: block generator fix
...
Stop errors when no $options supplied
2015-12-03 11:13:28 +01:00
0ad66dda0e
Merge branch 'MDL-52292' of git://github.com/timhunt/moodle
2015-12-03 11:13:26 +01:00
7828bb972e
Merge branch 'MDL-26935' of https://github.com/andrewhancox/moodle
2015-12-03 11:13:07 +01:00
8e9dc75e6c
Merge branch 'MDL-37308-master' of git://github.com/junpataleta/moodle
2015-12-03 11:11:06 +01:00
87b2ed6c1f
MDL-51746 accesslib: Describe instanceid in context_something::instance
...
With no PHPDocs and $instanceid as name some module developers confuse
context_module::instance argument to be instanceid of the module while
it actually should be cmid.
2015-12-03 11:11:05 +01:00
0ee52b8214
Merge branch 'MDL-51830-master' of git://github.com/lucisgit/moodle
2015-12-03 11:11:04 +01:00
00419a7a0b
Merge branch 'MDL-52237-master' of git://github.com/StudiUM/moodle
2015-12-03 11:11:02 +01:00
83bef8dabb
MDL-52335 tool_uploaduser: php7 compatibility in variable syntax
2015-12-03 09:31:25 +08:00
f9ba07133a
MDL-52335 core: php7 compatibility in XMPP library
2015-12-02 14:00:58 +08:00
4879477632
MDL-51700 ajax: Clean the external function return values
2015-12-02 10:30:01 +08:00
eb3884e48f
MDL-52292 block testing generators: improve the API
...
* Refactor the block generator base class, to remove the amount
of duplication required in base classes.
* Change the defaults that are filled in to be a little more natural.
* Make the Behat step 'Given the following "block" exist:' work.
2015-12-01 13:48:08 +00:00
c917b53a8d
MDL-50269 deprecations: Properly deprecate notify()
2015-12-01 15:29:33 +08:00
92efb347b0
Merge branch 'MDL-52074-master' of git://github.com/jleyva/moodle
2015-11-30 15:29:29 +00:00
ca593e5f69
Merge branch 'MDL-52108-master' of git://github.com/jleyva/moodle
2015-11-30 15:25:22 +00:00
8fea53a0b1
Merge branch 'MDL-51718-set-scheme' of https://github.com/brendanheywood/moodle
2015-11-30 13:37:47 +00:00
1db15fe9a7
Merge branch 'MDL-52042-master' of git://github.com/ryanwyllie/moodle
2015-11-30 13:20:35 +00:00
88f50b3551
Merge branch 'MDL-52283-master' of git://github.com/marinaglancy/moodle
2015-11-30 11:27:52 +00:00
8ffdb1309c
Merge branch 'MDL-52332-master' of git://github.com/marinaglancy/moodle
2015-11-30 10:23:07 +00:00
49f3c89324
MDL-52332 calendar: load settings using API
2015-11-30 11:36:50 +08:00
096b98ba34
MDL-52279 core_lib: Remove php4 style constructor
...
filterobject is called from core and as it's
using php4 style constructor, global USER is
not set properly because of deprecation warning
2015-11-30 11:25:55 +08:00
a33e5debe9
MDL-37308 files: Additional fixes for transparency
...
Fixed transparency support when resizing and when not resizing.
2015-11-29 20:28:19 -06:00
623c947f2b
MDL-37308 files: support transparency when not resizing; new unit test
2015-11-29 20:28:19 -06:00
e245843193
MDL-37308 files: convert_image() now supports transparency.
2015-11-29 20:28:18 -06:00
e746afacef
MDL-51719 atto_rtl: RTL/LTR buttons now indicate state
...
Previously the RTL buttons did not indiciate wether RTL or LTR was
selected. Thanks to Andrew Nicols for guiding how to do this.
2015-11-27 14:03:53 +00:00
79d4558a58
MDL-52283 core: password_hash() deprecation in PHP7
2015-11-27 09:12:20 +08:00
b27d4eac7f
MDL-45364 atto_rtl: Fix JS lint
2015-11-26 19:09:03 +00:00
42dcfffc4f
MDL-52160 navigation: Mark category and module settings nodes as branch
2015-11-25 13:03:25 +08:00
c506af7786
Merge branch 'MDL-44330' of git://github.com/NeillM/moodle
2015-11-24 17:03:06 +08:00
2bc40fc889
Merge branch 'MDL-45934-master' of git://github.com/danpoltawski/moodle
2015-11-24 16:53:18 +08:00
3fca693751
MDL-44330 Assign: Assignment grading may not display expected student
...
Before this patch it was possible for the student displayed on the grading page to
not be the student that the user selected to grade. This would occur if:
1) The user had the table ordered by a value that could be modified,
for example Last modified (submission), Grade, Last modified (grade)
2) Another user performed an action that was recorded in Moodle in the time
between the user generating the table and clicking on a grade link.
If a user did not notice a different user had been loaded it could result in them giving
a grade to the incorrect user.
This patch ensures that the state of the table is cached every time it is viewed by a user
who has the capability to grade.
2015-11-24 08:42:00 +00:00
David Monllao