Petr Škoda
b3e24b7f60
MDL-43314 make float serialize consistent on all systems
...
This should resolve problems with plugin version change detection.
2013-12-22 16:06:52 +08:00
Petr Škoda
2a8d78c00f
MDL-43367 stop returning of bogus context children when path unknown
...
This also prevents deletion of system context.
2013-12-22 16:00:09 +08:00
Tim Hunt
69be43879e
MDL-43448 Links to the gradebook not fixed on restore.
...
Note we can only fix certain generic links, we can't handle ones like
/grade/report/{reportname}/index.php, but fortunately, we were only
using the generic ones.
I added a couple of other likely things too (badges and participants
list).
2013-12-20 12:27:42 +00:00
Damyon Wiese
5d2169e053
weekly release 2.6+
2013-12-20 11:58:11 +08:00
Damyon Wiese
996c1d5b15
Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE
2013-12-20 11:58:07 +08:00
Damyon Wiese
206b1f6d6d
MDL-43318 Assign: Fix bug when editing previous attempt feedback
2013-12-20 11:15:00 +08:00
Gareth J Barnard
997731210c
MDL-41788 theme_bootstrapbase: Custom menus - sub-menus breaking.
2013-12-19 12:11:15 +00:00
David Monllao
83e305fa8c
MDL-43404 behat: Avoid failures at framework level as much as possible
...
- Move them to i_look_for_exceptions() so they will be
thrown at a step (scenario) level.
- Accept alerts only when they are detected to avoid
all the following scenarios to be failing; they would
continue executing, but they will all fail if the alert
is still there
- Add a step to avoid add_scorm.feature to fail
- Refine the UnknownError catch
2013-12-19 16:03:40 +08:00
Frederic Massart
50809576b5
MDL-43454 mod_assignment: Use of undefined constants FILE_*
2013-12-19 07:22:06 +01:00
Eloy Lafuente (stronk7)
2d2faf8087
Revert "MDL-43306 restore: fix grade item sortorder restoration"
...
This reverts commit 6afd79df8d
.
2013-12-19 02:14:03 +01:00
AMOS bot
5f41d7ce6b
Automatically generated installer lang files
2013-12-19 00:44:14 +00:00
Jean-Philippe Gaudreau
adcddcf776
MDL-41246 cache: Fix PHP notice of non well formed numeric values for the memcache store
2013-12-18 08:52:59 -05:00
Frederic Massart
15d16015b7
MDL-43438 mod_assignment: Prevent double inclusion of plugin files
2013-12-18 09:18:07 +01:00
David Monllao
6acf61d35e
MDL-43235 behat: Remove notice about undeclared var
2013-12-18 16:03:29 +08:00
Dan Poltawski
8d7c3b0d50
Merge branch 'MDL-41198-26' of https://github.com/mr-russ/moodle into MOODLE_26_STABLE
2013-12-18 14:59:59 +08:00
Russell Smith
4902bfaf3e
MDL-41198 lib: Add comment about the changes to srand on adodb
2013-12-18 16:53:17 +11:00
Russell Smith
9c5c2dbf5a
MDL-41198 lib: Allow PHP to generate random seed on script start
...
Most srand instances are removed to allow PHP to do the work.
srand was left for group randomization due to the method used.
2013-12-18 16:53:10 +11:00
Russell Smith
dd7e948dba
MDL-41198 lib: Allow PHP to generate random seed on script start
...
All mt_srand instances are removed to allow PHP to do the work.
2013-12-18 16:53:04 +11:00
Eloy Lafuente (stronk7)
ae20e634d7
Merge branch 'MDL-43404_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2013-12-18 02:24:19 +01:00
Russell Smith
c25dbc446a
MDL-41292 cache: only update identifiers if they change
2013-12-18 02:23:36 +01:00
Sam Hemelryk
12c847fed9
Merge branch 'MDL-43235_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2013-12-18 11:19:26 +13:00
Eloy Lafuente (stronk7)
04b53e0e0c
Merge branch 'MDL-43025-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
2013-12-17 22:59:14 +01:00
Sam Hemelryk
6a8e8ac25e
Merge branch 'MDL-43355_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE
2013-12-18 10:45:02 +13:00
Sam Hemelryk
f01cac675a
Merge branch 'MDL-43074-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
2013-12-18 09:58:51 +13:00
Andrew Nicols
6d69cf1045
MDL-43234 JavaScript: Clone dialogue configuration before initialising
...
Since we modify the config object when instantiating a new Dialogue, we
need to clone the configuration to prevent those changes from being
reflected back in the caller.
2013-12-18 09:53:35 +13:00
Sam Hemelryk
3aa576a8ef
Merge branch 'MDL-38698-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2013-12-18 09:21:31 +13:00
David Monllao
cc8ba5f12a
MDL-43404 behat: Form change checker disabled when running behat
2013-12-17 18:40:13 +08:00
David Monllao
303ea5f34e
MDL-43404 behat: Removing auto accept_alert
2013-12-17 18:40:06 +08:00
David Monllao
63e764faba
MDL-43423 behat: Running hooks before and after each step of a chained step
2013-12-17 18:14:48 +08:00
Eloy Lafuente (stronk7)
e74f735a99
Merge branch 'MDL-43306-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE
2013-12-17 10:29:34 +01:00
Frederic Massart
ae5884f8e6
MDL-38698 filter_urltolink: Remove performance test in Unit Test
2013-12-17 07:06:01 +01:00
Frederic Massart
2490febd82
MDL-38698 filter_urltolink: Do not link the URL property of CSS
2013-12-17 07:06:01 +01:00
Marina Glancy
df1914d111
Merge branch 'MDL-37679-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE
2013-12-17 16:37:42 +11:00
Marina Glancy
6e39ee0c82
Merge branch 'wip-MDL-43295-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE
2013-12-17 16:36:00 +11:00
Mark Nielsen
13e8736049
MDL-37679 Course: Adding section to page title on section only pages
2013-12-17 11:42:38 +08:00
Adrian Greeve
d868e5331c
MDL-43295 mod_assign: Removed wrongly used format_text call in online text submission.
2013-12-17 10:44:36 +08:00
Andrew Nicols
829897be3e
MDL-43410 JavaScript: Stop event propagation when opening the action menu
...
In certain situations, the click event is propagated through to the
hideIfOutside and immediately closes the menu.
This happens when blocks are dock for example.
2013-12-17 09:57:58 +08:00
Marina Glancy
20b9e53010
Merge branch 'MDL-41075-26' of git://github.com/mouneyrac/moodle into MOODLE_26_STABLE
2013-12-17 11:24:08 +11:00
Russell Smith
5470f3859f
MDL-39725 database: Apply database statistics update to daily stats
2013-12-17 10:26:49 +13:00
Russell Smith
9cd60b20d0
MDL-39725 database: Include stats collections in unit tests
2013-12-17 10:26:48 +13:00
Russell Smith
bd8dbfdbc3
MDL-39725 database: Add statistics collection functions
...
Conflicts:
lib/dml/moodle_database.php
2013-12-17 10:26:46 +13:00
Sam Hemelryk
21bb4f142c
Merge branch 'MDL-25473-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE
2013-12-17 08:54:22 +13:00
Sam Hemelryk
7809633d79
Merge branch 'MDL-34321-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE
2013-12-17 08:47:51 +13:00
Sam Hemelryk
7f574aadff
Merge branch 'MDL-36984-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE
2013-12-17 08:44:52 +13:00
Sam Hemelryk
9c099d21eb
Merge branch 'w51_MDL-43268_m26_filternotice' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2013-12-17 08:24:52 +13:00
Frederic Massart
8ee06a7b17
MDL-30195 portfolio_googledocs: Allow export of rich HTML
2013-12-16 11:06:57 +01:00
Jerome Mouneyrac
22c5c2f04c
MDL-43399 Badge: the Choose... option can still be selected once a role is choosen.
2013-12-16 14:33:45 +08:00
Frederic Massart
83818b0452
MDL-42212 mod_lesson: Use autoloading for mod_lesson_file_info
2013-12-16 07:26:13 +01:00
Frederic Massart
e81efe7691
MDL-42212 mod_lesson: Localise area names
2013-12-16 07:26:13 +01:00
Frederic Massart
a256d06cfd
MDL-42212 mod_lesson: Fix callbacks retrieving activity files
2013-12-16 07:26:13 +01:00