Ankit Agarwal
963cdce4e2
MDL-42097 auth: Auth plugins must check passwordurl before returning it
2013-12-03 14:17:42 +08:00
Damyon Wiese
8f49492ac2
Merge branch 'time-limit-fix' of https://github.com/danpoltawski/moodle
2013-12-03 14:17:34 +08:00
Ankit Agarwal
6513cc0376
MDL-42097 formslib: updates to edit profile form
...
Add a new dependency 'in' in forms library
Use the 'in' dependency to disable the 'changepassword' field when a auth plugin doesn't support it
2013-12-03 14:15:16 +08:00
Dan Poltawski
0b2f11dbc3
MDL-42084 lib: fix undefined variable warnings
2013-12-03 14:00:21 +08:00
Damyon Wiese
e7af63633e
Merge branch 'MDL-43081-master' of git://github.com/danpoltawski/moodle
...
Conflicts:
lib/upgrade.txt
2013-12-03 13:03:32 +08:00
Dan Poltawski
03742ae8f9
Merge branch 'MDL-43066_master' of git://github.com/dmonllao/moodle
2013-12-03 12:36:50 +08:00
Sam Hemelryk
a59a423926
Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle
2013-12-03 11:12:34 +13:00
Sam Hemelryk
b5fd2497d6
Merge branch 'w48_MDL-41819_m27_maxinputvars' of https://github.com/skodak/moodle
2013-12-03 10:25:26 +13:00
Tim Hunt
b2f1717143
MDL-43093 update repeat_elements PHPdoc.
2013-12-02 17:48:44 +00:00
Damyon Wiese
2a1e730eb3
Merge branch 'wip-MDL-39286-master' of git://github.com/ds125v/moodle
2013-12-02 15:16:12 +08:00
Dan Poltawski
6bc8b35add
Merge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle
2013-12-02 14:52:03 +08:00
Marina Glancy
6dfd8325f0
MDL-42731 behat: load 'Site administration' when expanding node in non-javascript mode
2013-12-02 17:44:32 +11:00
Damyon Wiese
cc9651dcae
Merge branch 'm27_MDL-43039_SessionDiskFull_False_Positive' of https://github.com/scara/moodle
2013-12-02 14:37:22 +08:00
Andrew Nicols
0bb56f2e31
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:28:37 +08:00
David Monllao
677b2e79f1
MDL-41592 general: Also checking the site path
2013-12-02 14:18:10 +08:00
David Monllao
7f7a91e4ce
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:18:10 +08:00
Aaron Barnes
cc2691a7bb
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:18:10 +08:00
David Monllao
e7c71c448b
MDL-42627 behat: Moving the deprecated method to behat_deprecate and updating scenarios
2013-12-02 14:13:17 +08:00
David Monllao
c3a40deab7
MDL-42627 behat: New steps definitions class for deprecated steps
2013-12-02 14:13:17 +08:00
David Monllao
0e825e5dd4
MDL-43066 behat: Checking that the site is not already installed
2013-12-02 14:10:57 +08:00
Damyon Wiese
bd3811f1b4
MDL-43018 Fix unit tests for minify changes.
2013-12-02 12:52:01 +08:00
Damyon Wiese
df68e73824
Merge branch 'MDL-40040-master' of git://github.com/ankitagarwal/moodle
2013-12-02 12:16:59 +08:00
Ankit Agarwal
164931570f
MDL-40040 events: Add blog events
...
Added blog_entries_viewed
Added blog_association_created
2013-12-02 12:06:32 +08:00
Dan Poltawski
466aa44471
Merge branch 'w49_MDL-43106_m27_doublecookie' of https://github.com/skodak/moodle
2013-12-02 11:58:01 +08:00
Damyon Wiese
8d68ea7233
Merge branch 'MDL-43018-master' of git://github.com/andrewnicols/moodle
2013-12-02 11:23:46 +08:00
Dan Poltawski
10c12c94a8
Merge branch 'wip-MDL-40191-master' of git://github.com/marinaglancy/moodle
2013-12-02 11:19:41 +08:00
Sam Hemelryk
c619d3d48d
Merge branch 'MDL-42876-master' of git://github.com/mouneyrac/moodle
2013-12-02 14:04:09 +13:00
Marina Glancy
f1d7254954
MDL-43150 tinymce_managefiles: fixed unattractive background
2013-12-02 12:01:27 +11:00
Petr Škoda
a377754770
MDL-41819 try to work around max_input_vars restriction
2013-12-02 08:29:08 +08:00
Sam Hemelryk
f2d7e2dca9
Merge branch 'MDL-42951-master' of git://github.com/FMCorz/moodle
2013-12-02 10:52:11 +13:00
Sam Hemelryk
06ef842707
Merge branch 'wip-mdl-33618' of https://github.com/rajeshtaneja/moodle
2013-12-02 10:35:46 +13:00
Petr Škoda
2f98f5d541
MDL-43117 Add release column to Plugins Overview page
...
This patch is based on previous patch by Marko Vidberg, thanks a lot!
2013-12-01 18:57:49 +08:00
Matteo Scaramuccia
35897a5223
MDL-43039 Libraries "The session partition is full." false positive.
2013-11-30 14:36:58 +01:00
Petr Škoda
226991e9fe
MDL-43106 fix double cookies on first access
2013-11-29 15:47:16 +08:00
Marina Glancy
dd47f2107f
MDL-43026 behat: add tests for all available module generators
2013-11-29 17:24:12 +11:00
Andrew Nicols
104d698ffd
MDL-43105 JavaScript: Use the correct versions of our rollups
2013-11-28 12:31:51 +08:00
Frederic Massart
74c4405b8a
MDL-42951 curl: Re-organise Unit Tests in smaller chunks
2013-11-28 12:14:13 +08:00
Frederic Massart
102230b23c
MDL-42951 curl: Always keep the last headers of a request
2013-11-28 12:00:42 +08:00
Dan Poltawski
fb16acf24e
MDL-43081 upgrade.txt: note generator change
2013-11-27 13:29:15 +08:00
Dan Poltawski
eeb6b7847b
Merge branch 'MDL-42942_master' of git://github.com/dmonllao/moodle
2013-11-27 11:32:23 +08:00
Andrew Nicols
19d97d6b15
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-27 09:33:14 +08:00
Damyon Wiese
e359857e41
Merge branch 'wip-MDL-43008-master' of git://github.com/abgreeve/moodle
2013-11-26 16:56:20 +08:00
Adrian Greeve
b404b1f41c
MDL-43008 calendar: Allow calendar plugins to display setting pages.
2013-11-26 15:44:57 +08:00
Dan Poltawski
2bc34d6528
Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle
2013-11-26 14:52:21 +08:00
Damyon Wiese
e6b1d132cb
MDL-41919 Forms: Add a class to form elements with an empty label
...
This means they can be styled properly when the form is folded with
the labels above the form fields.
2013-11-26 13:28:51 +08:00
Dan Poltawski
c9ed9e5662
Merge branch 'MDL-42733_master' of git://github.com/dmonllao/moodle
2013-11-26 12:09:45 +08:00
David Monllao
5df9e40cec
MDL-40741 behat: Changing xpaths for clean theme
...
Keeps compatibility with standard theme.
2013-11-26 11:41:13 +08:00
Marina Glancy
4fd2a16e35
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-11-26 13:54:19 +11:00
David Monllao
e2d7379682
MDL-42842 behat: Adding a new formatter
...
Based on ProgressFormatter, the site info
will be displayed when the suite begins.
2013-11-26 10:48:58 +08:00
David Monllao
7514c2f282
MDL-42842 testing: Generalization of the site info
2013-11-26 10:48:29 +08:00