Sam Hemelryk
1cb0536bcb
Merge branch 'w48_MDL-41819_m26_maxinputvars' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2013-12-03 09:58:10 +13:00
Michael Aherne
217c5d8208
MDL-42495 lesson Prevent coding error for invalid user
2013-12-02 10:53:20 +00:00
Dan Poltawski
d8be1d9ac5
Merge branch 'MDL-42989-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2013-12-02 14:53:37 +08:00
Damyon Wiese
88c5d93aa1
Merge branch 'm26_MDL-43039_SessionDiskFull_False_Positive' of https://github.com/scara/moodle into MOODLE_26_STABLE
2013-12-02 14:37:03 +08:00
Andrew Nicols
cbb87c9568
MDL-42989 Admin: Clean output when building site administration tree for JS
...
Previously, any inappropriate whitespace found whilst building the admin
tree caused a JSON error and for the site administration tree retrieval to
fail.
This change ensures that access to the site administration tree is unbroken
for non-developers, whilst still alerting developers that there is an
issue.
2013-12-02 14:34:11 +08:00
Jerome Mouneyrac
7d2f938cf0
MDL-42969 Main Menu Block loses ability to move resource or activity up or down (add back exact same behavior than in 2.5)
2013-12-02 14:24:16 +08:00
David Monllao
eb1931ccd1
MDL-41592 general: Also checking the site path
2013-12-02 14:19:25 +08:00
David Monllao
5f717f7aac
MDL-41592 behat: Config settings more flexible
...
Adding the option to just set ->behat_wwwroot to
allow switching to the behat test site.
2013-12-02 14:19:25 +08:00
Aaron Barnes
64c5119637
MDL-41592 behat: Allow alt wwwroot to be set for acceptance testing
...
To set add $CFG->behat_wwwroot = 'http://alturl '; in your config.php
2013-12-02 14:19:25 +08:00
David Monllao
dad1bc64c5
MDL-42627 behat: Replacing calls to deprecated step
...
Switching to the selector-based ..in the "LOCATOR" "table_row"
2013-12-02 14:13:49 +08:00
David Monllao
812fa23e82
MDL-43066 behat: Checking that the site is not already installed
2013-12-02 14:11:33 +08:00
Damyon Wiese
fe0d1d488b
MDL-43018 Fix unit tests for minify changes.
2013-12-02 12:52:43 +08:00
Dan Poltawski
d76bc30606
Merge branch 'w49_MDL-43106_m26_doublecookie' of https://github.com/skodak/moodle into MOODLE_26_STABLE
2013-12-02 11:58:23 +08:00
Damyon Wiese
39177fd3a7
Merge branch 'MDL-43018-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2013-12-02 11:23:23 +08:00
Dan Poltawski
0c94afe7af
Merge branch 'wip-MDL-40191-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2013-12-02 11:19:45 +08:00
Tim Hunt
b14196043d
MDL-43068 course&gradebook: show/hide cm & CONTROLS_GRADE_VISIBILITY
...
Making a quiz visible on the course page, of via the settings form,
could cause the grade item to become visible in the gradebook, even
though the quiz supports FEATURE_CONTROLS_GRADE_VISIBILITY to ensure
that when the grades are hidden in the quiz settings, they do not appear
in the gradebook.
Now, if a module supports FEATURE_CONTROLS_GRADE_VISIBILITY, then
set_coursemodule_visible calls the _grade_item_update callback to update
the grade item(s).
In addition, there was a bug when saving the quiz form, where it used
the value of $cm->visible from the database, which was wrong if the
value of cm->visible had just been changed on the setting form.
2013-12-02 11:12:53 +08:00
Damyon Wiese
2f6a01e094
Merge branch '43033-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2013-12-02 09:51:08 +08:00
Jerome Mouneyrac
c68fa5fcbb
MDL-42876 Screen reader does not trigger the keyboard move
2013-12-02 14:07:28 +13:00
Marina Glancy
4f7ec48046
MDL-43150 tinymce_managefiles: fixed unattractive background
2013-12-02 12:02:04 +11:00
AMOS bot
fe0f1f5c19
Automatically generated installer lang files
2013-12-02 00:42:53 +00:00
Sam Hemelryk
f098ca6d97
Merge branch 'MDL-42918_m26' of git://github.com/rwijaya/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-12-02 13:39:51 +13:00
Petr Škoda
8aac99eb3d
MDL-41819 try to work around max_input_vars restriction
2013-12-02 08:29:41 +08:00
Marina Glancy
1affdad829
MDL-40191 navigation: do not throw an error if activity is not visible
...
navigationlib is not the place to check it, let the page itself decide what to do in this case
2013-12-02 10:48:38 +11:00
Marina Glancy
f497fd1de8
MDL-43026 behat: add tests for all available module generators
2013-12-02 10:38:29 +11:00
Marina Glancy
0a44a45fea
MDL-42731 block_activity_modules: added behat tests
2013-12-02 10:15:52 +11:00
Marina Glancy
fdc93e4092
MDL-42731 behat: load 'Site administration' when expanding node in non-javascript mode
2013-12-02 10:15:33 +11:00
Frederic Massart
add7675e51
MDL-42951 curl: Re-organise Unit Tests in smaller chunks
2013-12-02 10:55:57 +13:00
Frederic Massart
20f8cd8551
MDL-42951 curl: Always keep the last headers of a request
2013-12-02 10:55:57 +13:00
Sam Hemelryk
7ac884d457
MDL-43033 cache: added stats logging to set_many methods
2013-12-02 09:29:44 +13:00
Sam Hemelryk
4bbbd50202
MDL-43033 cache: fixed display of definition stores in admin interface
2013-12-02 09:29:44 +13:00
Sam Hemelryk
e6175024e6
MDL-43033 cache: added a warning icon for mappings
...
We now show a warning icon with an explanatory alt if the user
has mapped a store as a mode default that doesn't not fulfill the
requirements of every known definition.
2013-12-02 09:29:44 +13:00
Sam Hemelryk
c21a04f63e
MDL-43033 cache: fixed mode map event invalidation scenario
2013-12-02 09:29:44 +13:00
Sam Hemelryk
ad3bbeb5c0
MDL-43033 cache: added stats logging to get_many methods
2013-12-02 09:29:44 +13:00
Matteo Scaramuccia
18d2aac902
MDL-43039 Libraries "The session partition is full." false positive.
2013-11-30 14:35:31 +01:00
Mark Nelson
5546df9078
MDL-43140 mnet: display header after redirects to avoid warning
2013-11-29 14:26:08 -08:00
Mark Nelson
d0e29366de
MDL-43142 mnet: fixed typo in variable passed to get_string
2013-11-29 14:15:24 -08:00
Petr Škoda
78da7d9529
MDL-43106 fix double cookies on first access
2013-11-29 15:47:52 +08:00
Dan Poltawski
ea04def291
weekly release 2.6+
2013-11-29 12:52:56 +08:00
Dan Poltawski
6ba3f5d72a
Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE
2013-11-29 12:52:52 +08:00
Tim Lock
2153633aac
MDL-42487: Forced userprofile dl style to be displayed: inline-block.
2013-11-29 09:26:52 +10:30
Eloy Lafuente (stronk7)
d6ece9f7f0
Merge branch 'MDL-42957-26' of https://github.com/jamiepratt/moodle into MOODLE_26_STABLE
2013-11-28 12:44:13 +01:00
James Pratt
a69c78724e
MDL-42957 (3) quiz statistics : removing assertEquals(time(), ..) tests
2013-11-28 17:59:05 +07:00
James Pratt
7968f77edb
MDL-42957 (2) quiz statistics : Hardcoded sql LIMIT clause
...
Fixing some typos and adding some tests.
2013-11-28 17:35:39 +07:00
AMOS bot
6d7583c9b2
Automatically generated installer lang files
2013-11-28 09:12:40 +00:00
Andrew Nicols
6dae822543
MDL-43105 JavaScript: Use the correct versions of our rollups
2013-11-28 12:32:18 +08:00
Andrew Nicols
451044df4e
MDL-43018 JavaScript: Correct joining of multiple minified JS
...
When minifiying JS, unnecessary semi-colons are removed - this includes the
trailing semi-colon.
Since we join multiple files together after minification, we need to add an
additional semi-colon in this situation to produce valid JavaScript.
2013-11-28 11:54:53 +08:00
Adrian Greeve
9daaa37aac
MDL-43058 reports: updated sql to return fullnames in security check reports.
2013-11-27 14:57:11 +08:00
Rajesh Taneja
1880d3684c
MDL-43048 block_tags: Initalised content->text for tags block
2013-11-27 14:37:07 +08:00
Mark Nelson
dcef51b614
MDL-42885 tool_uploaduser: removed misleading debugging message
2013-11-26 21:26:23 -08:00
Dan Poltawski
66d40a5dae
MDL-42942 behat: increment version
2013-11-27 11:37:32 +08:00