15240 Commits

Author SHA1 Message Date
Sam Hemelryk
5c1d5998ac Merge branch 'MDL-37127-m' of git://github.com/andrewnicols/moodle 2013-03-05 13:54:10 +13:00
Eloy Lafuente (stronk7)
86d053490d Merge branch 'wip-MDL-36215-m25' of git://github.com/samhemelryk/moodle 2013-03-05 01:27:50 +01:00
Eloy Lafuente (stronk7)
2b48123b92 Merge branch 'wip-MDL-38300-m25' of git://github.com/samhemelryk/moodle 2013-03-05 01:21:47 +01:00
Eloy Lafuente (stronk7)
adc4aca475 Merge branch 'MDL-37897' of git://github.com/jmvedrine/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-03-05 00:56:24 +01:00
Eloy Lafuente (stronk7)
cdbbd48a66 Merge branch 'MDL-38261-workshop-attachments-size' of git://github.com/mudrd8mz/moodle 2013-03-05 00:48:47 +01:00
Eloy Lafuente (stronk7)
2673254919 Merge branch 'wip-MDL-32975-m25' of git://github.com/samhemelryk/moodle 2013-03-04 23:47:13 +01:00
Sam Hemelryk
f87ce4e9a0 MDL-32975 navigation: Added option to select how my courses are sorted 2013-03-05 09:46:11 +13:00
Sam Hemelryk
cf7386139d MDL-31983 navigation: fixed copy+paste typo 2013-03-05 09:24:19 +13:00
Eloy Lafuente (stronk7)
25ba263d60 Merge branch 'MDL-38133-master' of git://github.com/sammarshallou/moodle 2013-03-04 20:37:57 +01:00
Eloy Lafuente (stronk7)
d03d5e7816 Merge branch 'wip-MDL-33013-m25' of git://github.com/samhemelryk/moodle 2013-03-04 20:18:48 +01:00
Eloy Lafuente (stronk7)
8b0f09d940 Merge branch 'MDL-36380-master' of git://github.com/FMCorz/moodle 2013-03-04 17:59:39 +01:00
Eloy Lafuente (stronk7)
d5834b3712 Merge branch 'MDL-38170-master' of git://github.com/sammarshallou/moodle 2013-03-04 16:25:00 +01:00
Sam Hemelryk
4ce761716c Merge branch 'MDL-31557_master' of git://github.com/markn86/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-03-04 14:35:59 +13:00
Sam Hemelryk
74bf99ddad Merge branch 'MDL-37625-master' of https://github.com/jfilip/moodle 2013-03-04 14:18:49 +13:00
Sam Hemelryk
121e604851 Merge branch 'MDL-38168-master' of git://github.com/sammarshallou/moodle 2013-03-04 13:35:16 +13:00
Frederic Massart
954b354511 MDL-37507 repositories: improved formatting of external resources 2013-03-04 13:28:41 +13:00
Mark Nielsen
8d220cb552 MDL-36901: Remove system paths from exceptions
Replaces any server paths, like dataroot, with a token
in exception messages and debug info.
2013-03-04 00:17:01 +01:00
sam marshall
85cb4b65b1 MDL-38170 SimplePie: Cannot read https feeds through proxy 2013-03-01 10:36:51 +00:00
Andrew Robert Nicols
e2798523d6 MDL-37127 JavaScript: Switch moodle-core-tooltip to shifter 2013-03-01 01:33:08 +00:00
Andrew Robert Nicols
a45e8fd3da MDL-37127 JavaScript: Add support for development using YUI Shifter 2013-03-01 01:25:54 +00:00
Sam Hemelryk
8bc8ab6ee8 MDL-36215 navigation: fixed blog URL within courses using groups 2013-03-01 10:08:42 +13:00
Sam Hemelryk
ba7b1ca565 MDL-33013 navigation: fixed expansion limit issue hiding nodes 2013-03-01 10:08:20 +13:00
David Mudrák
8f5cbbd6c8 MDL-38261 Add a new file preview mode for bigger thumbnails 2013-02-28 18:53:37 +01:00
Jean-Michel Vedrine
4f315786e8 MDL-37897 Remove useless Blackboard question import format 2013-02-28 17:46:29 +01:00
Frederic Massart
bed828de91 MDL-36380 stats: Issue with DST and monthly statistics 2013-02-28 13:56:05 +08:00
Eloy Lafuente (stronk7)
9515c34ee6 Merge branch 'wip-MDL-30669-master' of git://github.com/abgreeve/moodle 2013-02-26 09:46:13 +01:00
Mark Nelson
5fb496743f MDL-31557 install: removing PREVIOUS and NEXT attributes from install.xml for newly introduced index 2013-02-26 12:12:05 +08:00
Tim Gus
e1580085c4 MDL-31557 Add index for timemodified in grade_grades_history table 2013-02-26 12:11:59 +08:00
Dan Poltawski
d28d214167 Merge branch 'w08_MDL-38154_m25_delperf' of git://github.com/skodak/moodle 2013-02-26 11:08:52 +08:00
Damyon Wiese
be1ef2f35d MDL-37792 Course - Fix upgrade step and set version number for completion field fix. 2013-02-26 10:49:46 +08:00
Damyon Wiese
b672408a1a Merge branch 'MDL-37792-master' of git://github.com/sammarshallou/moodle 2013-02-26 10:45:21 +08:00
Dan Poltawski
84f72e28fd Merge branch 'MDL-38161' of git://github.com/stronk7/moodle 2013-02-26 10:40:51 +08:00
Adrian Greeve
3dd204b1e6 MDL-30669 - blocks: Added a warning when deleting blocks that have multiple displays set.
Also added a fix to the function course_page_type_list(). It was making a call to
get_context_info_array() which will generate an error if $currentcontext is not set.
2013-02-26 10:21:37 +08:00
Dan Poltawski
e7054f06e3 MDL-37455 - redirect for mod_folder course breaking changes 2013-02-26 10:06:29 +08:00
Eloy Lafuente (stronk7)
64870338c4 Merge branch 'w08_MDL-37963_m25_usergen' of git://github.com/skodak/moodle 2013-02-26 01:25:58 +01:00
Eloy Lafuente (stronk7)
1e171d4d37 Merge branch 'MDL-38090-m' of git://github.com/andrewnicols/moodle 2013-02-26 00:33:32 +01:00
Eloy Lafuente (stronk7)
05fc7ccc82 Merge branch 'MDL-30098_master' of git://github.com/markn86/moodle
Conflicts:
	course/tests/externallib_test.php
2013-02-25 23:38:20 +01:00
sam marshall
6fea7a5f02 MDL-37792 Conditions: Interests condition offered but not implemented 2013-02-25 13:19:56 +00:00
sam marshall
4c4e587648 MDL-38133 html_writer: add shortcuts for very frequent tags 2013-02-25 12:41:24 +00:00
Petr Škoda
18fa4f4745 MDL-38154 do not hardcode sha1 hash of empty string 2013-02-25 10:10:57 +01:00
Damyon Wiese
fffb9bbe64 Merge branch 'wip-MDL-38145-master' of git://github.com/marinaglancy/moodle 2013-02-25 15:42:13 +08:00
Dan Poltawski
2b32b2eea0 Merge branch 'wip-MDL-38163-m25' of git://github.com/samhemelryk/moodle 2013-02-25 15:39:30 +08:00
Damyon Wiese
61725199a9 Merge branch 'MDL-37641-master' of git://github.com/FMCorz/moodle 2013-02-25 15:23:19 +08:00
Dan Poltawski
bbd045b9e6 Merge branch 'w08_MDL-38121_m25_plugincheck' of git://github.com/skodak/moodle 2013-02-25 14:34:07 +08:00
Frederic Massart
2e0bb2af8b MDL-36380 stats: No more duplicated entries when viewing monthly stats 2013-02-25 13:55:37 +08:00
Damyon Wiese
cc7a1c8916 Merge branch 'wip-MDL-30072-master' of git://github.com/phalacee/moodle 2013-02-25 12:37:56 +08:00
Dan Poltawski
24ace4b795 Merge branch 'wip-MDL-38091-master' of git://github.com/marinaglancy/moodle 2013-02-25 11:00:03 +08:00
Petr Škoda
dbf60a042c MDL-37963 hash only given passwords in user generator 2013-02-24 10:40:55 +01:00
Petr Škoda
bdbcb6d7fa MDL-38121 tell admins when plugin installed into wrong dir 2013-02-23 18:16:42 +01:00
Petr Škoda
e029dff4cd MDL-38154 improve dir delete performance 2013-02-23 15:10:48 +01:00