Commit graph

63921 commits

Author SHA1 Message Date
Damyon Wiese
6f81158a7e Merge branch 'MDL-40162_master' of https://github.com/totara/openbadges 2013-08-20 14:45:34 +08:00
Damyon Wiese
5a10d2a7ae Merge branch 'wip-mdl-40043' of git://github.com/rajeshtaneja/moodle
Conflicts:
	course/tests/courselib_test.php
	lang/en/moodle.php
2013-08-20 14:40:42 +08:00
Jenny Gray
740c4ada36 MDL-39800 tags: moved cloud sorting to print function 2013-08-20 14:26:21 +08:00
Jenny Gray
5ea6ac9802 MDL-39800 tags: Applied weight and ordering fix on all more page options
Also:
Fixed weight and ordering on more page show=all
Fixed weight and ordering on more page show=my
rationalised tag_print_cloud lines now identical
2013-08-20 14:26:20 +08:00
Jenny Gray
df428badaf MDL-39800 tags: resolved weighting in block content 2013-08-20 14:26:20 +08:00
Dan Poltawski
d5b076a2ca Merge branch 'wip-MDL-37674-m26' of git://github.com/samhemelryk/moodle 2013-08-20 14:21:38 +08:00
Rajesh Taneja
71298fea03 MDL-40043 Events API: Added user_loggedinas event to replace add_to_log 2013-08-20 14:07:35 +08:00
Rajesh Taneja
ed29bf0f66 MDL-40043 Events API: Added course_section_updated event to replace add_to_log 2013-08-20 14:07:35 +08:00
Damyon Wiese
eedb6aae3f Merge branch 'MDL-27595-2' of https://github.com/bostelm/moodle 2013-08-20 13:31:16 +08:00
Damyon Wiese
43cc62ed13 Merge branch 'MDL-41036' of git://github.com/timhunt/moodle 2013-08-20 12:55:31 +08:00
Dan Poltawski
91a888df34 Merge branch 'MDL-39957_master' of https://github.com/markn86/moodle 2013-08-20 12:38:08 +08:00
Damyon Wiese
5a2356be38 Merge branch 'MDL-41122_master' of git://github.com/kastashov/moodle 2013-08-20 12:28:00 +08:00
Damyon Wiese
b277230aad Merge branch 'MDL-39956-master' of git://github.com/FMCorz/moodle 2013-08-20 12:21:04 +08:00
Dan Poltawski
bfa4c3f358 Merge branch 'MDL-36002-master' of git://github.com/damyon/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-08-20 12:17:16 +08:00
Dan Poltawski
6f44a73369 Merge branch 'w33_MDL-39474_m26_debugdeveloper' of https://github.com/skodak/moodle
Conflicts:
	lib/upgrade.txt
2013-08-20 11:42:03 +08:00
Dan Poltawski
8ab325fb00 Merge branch 'MDL-38203' of git://github.com/timhunt/moodle 2013-08-20 11:28:39 +08:00
Adrian Greeve
db22e31b1e MDL-41231 - mod_data: Export to portfolio and delete selected now work together. 2013-08-20 11:28:09 +08:00
Dan Poltawski
57cb5f5afa Merge branch 'WIP-MDL-36044-master' of git://github.com/nadavkav/moodle 2013-08-20 11:07:53 +08:00
Dan Poltawski
54a868d3be Merge branch 'MDL-39236-master' of git://github.com/nadavkav/moodle 2013-08-20 10:59:31 +08:00
Dan Poltawski
9d66c2bb5b Merge branch 'MDL-39980' of git://github.com/timhunt/moodle 2013-08-20 10:47:45 +08:00
Tim Lock
6b718780c6 MDL-41304: Hide and handle LDAP error when user not in context being checked 2013-08-20 10:34:16 +09:30
AMOS bot
943db9d438 Automatically generated installer lang files 2013-08-20 00:42:25 +00:00
Marina Glancy
5a3204d05b MDL-41222 Remove unnecessary course cache rebuild 2013-08-20 10:27:15 +10:00
Russell Smith
90048725b0 MDL-41291 cache: Use fread to avoid race conditions 2013-08-19 20:18:57 +10:00
Dan Poltawski
599d7d9bdf Merge branch 'MDL-30839-master' of git://github.com/phalacee/moodle 2013-08-19 17:40:37 +08:00
Damyon Wiese
ea8c248c96 MDL-36002 keyboard drag drop: Hidden activities and labels
Get the correct title for hidden activities and labels.
2013-08-19 16:18:23 +08:00
Damyon Wiese
e5cb7f8b7b Merge branch 'master_MDL-39572' of https://github.com/totara/moodle 2013-08-19 15:42:17 +08:00
Damyon Wiese
26ae471585 Merge branch 'MDL-40896' of git://github.com/timhunt/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-08-19 15:38:23 +08:00
Damyon Wiese
5ebe37fb27 Revert "MDL-41106 cache: several fixes for the session cache."
This reverts commit 89182546a0.
This reverts commit 170b05362a.
This reverts commit 2e9d5a534e.
2013-08-19 15:32:08 +08:00
Dan Poltawski
c3b087ccc3 Merge branch 'MDL-40893-master' of https://github.com/mr-russ/moodle 2013-08-19 14:50:01 +08:00
Damyon Wiese
3415e1ca59 Merge branch 'wip-MDL-41106-m26' of git://github.com/samhemelryk/moodle 2013-08-19 13:50:46 +08:00
Damyon Wiese
d51f9d5fd0 Merge branch 'wip-MDL-36789-master' of git://github.com/marinaglancy/moodle 2013-08-19 13:29:55 +08:00
Dan Poltawski
bee137b65a Merge branch 'MDL-39703_master' of https://github.com/nadavkav/moodle 2013-08-19 13:08:10 +08:00
Dan Poltawski
a945d48127 Merge branch 'master_MDL-37393' of github.com:danmarsden/moodle 2013-08-19 12:57:34 +08:00
Andrew Davis
e9c599cb84 MDL-39770 mod_chat: improved the chat experience on small screens 2013-08-19 09:08:40 +07:00
Jason Fowler
0c99005a9a MDL-30839 Accessibility, Forms - Improve accessibility or error messages 2013-08-19 09:54:41 +08:00
AMOS bot
0738c90cec Automatically generated installer lang files 2013-08-19 00:42:35 +00:00
Sam Hemelryk
89182546a0 MDL-41106 cache: tidied up several elements 2013-08-19 11:32:08 +12:00
Marina Glancy
170b05362a MDL-41106 Cleaning up expired elements in session cache store
- Always make sure the elements in cache are sorted so we need to remove only elements in the beginning of array
- Remove expired elements from session store to free memory
- Minor bug fixes
2013-08-19 09:28:36 +12:00
Nadav Kavalerchik
48e5db7428 MDL-40752 - Login panel should be placed on the right side, in RTL mode (theme/clean, bootstrap) 2013-08-18 22:04:02 +03:00
Nadav Kavalerchik
373c610ed1 MDL-39703 Roles, Themes: Fix "Add role" dialog width and position, in RTL mode (theme/clean) 2013-08-18 21:51:51 +03:00
Nadav Kavalerchik
42fabe1e87 MDL-36044 - Delete Icon ("X") blocks Score numbers, when in RTL mode (mod/assign , Rubrics editor) 2013-08-18 17:40:00 +03:00
Andrew Nicols
0ef6f6860d MDL-41258 Forum: Add additional unit tests for forum digest settings 2013-08-18 00:03:06 +01:00
Nadav Kavalerchik
445d4cc065 MDL-40447 Administration: Fix translation: "Profile" should be "Profile Fields" on advanced (more...) user filter form 2013-08-17 23:30:39 +03:00
sam marshall
f06abc2ac1 MDL-38190 (3) Backup/restore: Progress display in main user interface 2013-08-16 16:28:04 +01:00
sam marshall
bc4054f9dd MDL-38197 Script to generate standard-size large course for testing 2013-08-16 12:09:55 +01:00
sam marshall
2531ae2922 MDL-38190 (2) Backup/restore: Progress tracking for tasks and steps 2013-08-16 10:50:36 +01:00
sam marshall
16cd708835 MDL-38190 (1) Backup/restore: Progress tracking API 2013-08-16 10:50:35 +01:00
Nadav Kavalerchik
1a46c81c87 MDL-37211 Backup: Migrate hard-coded strings to language string for the table header labels on the restore page 2013-08-16 12:24:10 +03:00
Nadav Kavalerchik
6700806403 MDL-39236 - Right align table cells during install process, when in RTL mode (theme/standard, actually theme/base) 2013-08-16 11:53:14 +03:00