Damyon Wiese
057a79922e
Merge branch 'MDL-42701' of git://github.com/stronk7/moodle
2013-11-05 13:10:52 +08:00
Dan Poltawski
6ce30a3e2c
Merge branch 'MDL-42385_master' of git://github.com/dmonllao/moodle
2013-11-05 12:34:35 +08:00
Ray Morris
82d305fafa
MDL-42265 make Browse Users list scrollable for smaller screens
2013-11-05 10:49:20 +08:00
Eloy Lafuente (stronk7)
f39c82ebed
MDL-42701 Bump all versions near 2.6 release
2013-11-05 02:36:00 +01:00
Damyon Wiese
9995aa3852
Merge branch 'w45_MDL-42512_m26_filtermess' of https://github.com/skodak/moodle
2013-11-05 09:31:41 +08:00
Dan Poltawski
db6767ae47
Merge branch 'w45_MDL-42044_m26_zipaddon' of https://github.com/skodak/moodle
2013-11-04 16:14:04 +08:00
Petr Škoda
372154ff15
MDL-42512 finally fix the indentation of filter management page
2013-11-04 08:28:51 +01:00
Petr Škoda
137f573cfd
MDL-42512 fix and cleanup filter management page
2013-11-04 08:24:28 +01:00
Damyon Wiese
d04bea30da
Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle
2013-11-04 13:11:42 +08:00
Petr Škoda
4cf944c6bc
MDL-42044 minor add-on installer unit tests cleanup
2013-11-01 10:43:14 +01:00
Petr Škoda
99456a5559
MDL-42044 standardise list of unzipped files in add-on installer
2013-11-01 10:43:13 +01:00
David Monllao
63950e4d0b
MDL-42236 behat: New steps to look for elements visibility
2013-11-01 08:55:27 +08:00
David Monllao
32fcea7415
MDL-42385 behat: New test to cover MDL-38661
...
Also refactoring set site settings step
as it has problems to deal with multiple-field
settings.
2013-10-30 18:32:12 +08:00
Petr Škoda
c3f0f2fd79
MDL-40683 fix user upload form validation problem
2013-10-29 12:05:29 +01:00
Damyon Wiese
e17bac441d
Merge branch 'wip-MDL-40683-master' of git://github.com/abgreeve/moodle
2013-10-29 16:42:48 +08:00
Dan Poltawski
b6df9f8f55
Merge branch 'wip-mdl-42560' of git://github.com/rajeshtaneja/moodle
2013-10-29 13:09:23 +08:00
Dan Poltawski
b1a6c9dc52
Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle
...
Conflicts:
login/change_password.php
2013-10-28 15:37:05 +08:00
Damyon Wiese
9a84376d4b
Merge branch 'w44_MDL-42110_m26_addoninstaller' of https://github.com/skodak/moodle
2013-10-28 12:39:30 +08:00
Rajesh Taneja
045d913d11
MDL-42560 Events: Removed use of role->name
...
role->name is usually empty or localized, so should not be used in events
2013-10-28 11:06:47 +08:00
Adrian Greeve
c00252fbed
MDL-40683 administration: Include alternate name fields in CSV user import.
...
Removal of firstname and lastname from STD_FIELDS
2013-10-28 09:14:44 +08:00
Adrian Greeve
6f4ece9f57
MDL-40683 libraries: Include alternate name fields in CSV user import.
2013-10-28 09:08:48 +08:00
Marina Glancy
7cff3faa94
MDL-42400 tool_generator: save db query in module generation
2013-10-26 14:00:24 +11:00
Petr Škoda
a635424f88
MDL-42110 use parent directory permissions when installing add-ons
2013-10-25 21:23:40 +02:00
David Monllao
a068887e3d
MDL-42538 behat: Fixing wrong number of users
2013-10-25 11:22:34 +08:00
Dan Poltawski
276c451b2a
Merge branch 'MDL-42343_master' of git://github.com/dmonllao/moodle
2013-10-23 15:12:22 +08:00
Damyon Wiese
db812f5e5a
Merge branch 'w43_MDL-42208_m26_authunmask' of https://github.com/skodak/moodle
2013-10-23 13:37:24 +08:00
Petr Škoda
a668a7e420
MDL-42208 fix JS get_string usage and remove unnecessary params from auth password unmask init
2013-10-23 07:32:24 +02:00
Marina Glancy
c5df0a63bc
Merge branch '42170-26' of git://github.com/samhemelryk/moodle
2013-10-23 11:43:23 +11:00
Petr Škoda
d5814f4e22
MDL-41811 simplify the admin tree detection logic and fix navigation in multiple areas
2013-10-21 14:17:55 +08:00
Rajesh Taneja
bafcd3f17a
MDL-41811 navigation: Load site admin navigation
...
Go to notification page before following links within site admin
navigation, ensuring site admin navigation is loaded
With no js, test should follow site admin link and not expand it.
2013-10-21 14:17:55 +08:00
David Monllao
4338c6fc53
MDL-42408 behat: Setting the site summary
2013-10-21 14:17:54 +08:00
Rajesh Taneja
b92adf24a4
MDL-41811 navigation: Fixed navigation issues on pages
...
Few admin pages don't add navigation node and hence they should
not show site admin
2013-10-21 14:17:54 +08:00
Petr Škoda
e56c107da8
MDL-41811 tweak custom admin pages to force loading of admin tree
2013-10-21 14:17:53 +08:00
Petr Škoda
61bb8c933f
MDL-41811 find out if admin tree needed in navigation
2013-10-21 14:17:53 +08:00
David Monllao
98d72f12af
MDL-42343 tool_generator: Using the new session manager
2013-10-21 11:14:14 +08:00
David Monllao
a0e89a8fe3
MDL-42408 behat: Setting the site summary
2013-10-21 11:09:39 +08:00
Petr Škoda
6e0ace3885
MDL-42208 add password unhiding option to auth configs
2013-10-18 15:12:18 +02:00
Petr Škoda
b2858b916a
MDL-42148 new overview of 3rd party libraries
...
Includes:
* each plugin has own thirdpartylibs.xml file
* added missing libraries
* fixed existing library infos
* new Site administration / Development / Third party libraries page
2013-10-16 14:48:29 +08:00
Marina Glancy
e3d43f0d73
Merge branch 'wip-MDL-42234-master' of git://github.com/abgreeve/moodle
2013-10-15 14:11:15 +11:00
Adrian Greeve
40a473d5e7
MDL-42234 - Repositories: Fix undefined variable notice when no repositories are enabled.
2013-10-15 10:40:23 +08:00
Eloy Lafuente (stronk7)
3745472f63
Merge branch 'MDL-42241-master' of git://github.com/ankitagarwal/moodle
2013-10-15 01:58:51 +02:00
Damyon Wiese
35d7ba167a
Merge branch 'MDL-42198_master' of git://github.com/dmonllao/moodle
2013-10-14 16:14:38 +08:00
David Monllao
8f50ec7db6
MDL-42198 tool_generator: Changing test plan default values
...
To achieve more stability on test results we
switch to less users and more loops.
2013-10-14 12:46:02 +08:00
David Monllao
9a79e456c2
MDL-42151 behat: Adding the version to the testplan
2013-10-14 12:43:52 +08:00
Ankit Agarwal
96e991631d
MDL-42241 tool_uploadcourse: Fix incorrect urls
2013-10-10 17:59:41 +08:00
Damyon Wiese
370058d8fb
Merge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle
...
Conflicts:
lib/upgrade.txt
2013-10-10 10:49:11 +08:00
Sam Hemelryk
c80ef689d5
Merge branch 'wip-mdl-41744' of https://github.com/rajeshtaneja/moodle
2013-10-10 14:40:02 +13:00
Marina Glancy
44cd0b03af
Merge branch 'wip-mdl-38155' of git://github.com/rajeshtaneja/moodle
2013-10-10 11:23:06 +11:00
Damyon Wiese
5cc2c6662d
Merge branch 'MDL-41347-master' of git://github.com/FMCorz/moodle
2013-10-09 12:03:54 +08:00
Dan Poltawski
e521e0724e
Merge branch 'MDL-41230-master' of git://github.com/FMCorz/moodle
2013-10-09 11:16:34 +08:00