Dan Poltawski
f9fc19cdae
Merge branch 'MDL-49844-master' of git://github.com/lameze/moodle
2015-04-16 13:45:20 +01:00
Dan Poltawski
1d81e1afc0
Merge branch 'MDL-49842-master' of git://github.com/xow/moodle
2015-04-16 10:30:28 +01:00
David Monllao
960c0ec405
Merge branch 'wip-mdl-49456' of git://github.com/rajeshtaneja/moodle
2015-04-16 16:39:20 +08:00
Dan Poltawski
36410f1a69
Merge branch 'm29_MDL-47004_LDAP_Better_Default_ObjectClass' of https://github.com/scara/moodle
2015-04-16 09:22:21 +01:00
Rajesh Taneja
72bac0d3f2
MDL-49456 behat: Fixed following issues in parallel run
...
1. Parallel run without feature should exit with success
2. Updated exit codes to be more clear for each process
3. Fixed wwwroot and dataroot while executing with tags
4. Added support for running scenario/feature
5. Added support for or'ing tags
6. Added support for running single behat site
7. Fixed wrong example in help
8. Use parallel run only when parallel > 1
9. Exit showing behat site is not installed
10. Exit with error, if not a valid option
11. Added usage in help to explain how to use command
12. run.php should be able to run from any path
13. Pass all arguments to single run
2015-04-16 15:44:25 +08:00
John Okely
65903c7607
MDL-49842 install: Set front page summary to '' after cli install
...
This is to prevent front page summary from appearing as a 'new setting'
after the first upgrade of a site installed via cli.
2015-04-16 11:49:22 +08:00
David Monllao
7187ec30cb
Merge branch 'MDL-49377-master-updatemsg' of git://github.com/mudrd8mz/moodle
2015-04-16 09:44:10 +08:00
Andrew Nicols
fb3b04cb03
Merge branch 'patch-1' of https://github.com/sk-unikent/moodle
2015-04-16 07:45:04 +08:00
Matteo Scaramuccia
6514ced4f5
MDL-47004 LDAP: improved the default objectClass setting for AD.
2015-04-15 23:53:35 +02:00
Dan Poltawski
75e20c1845
Merge branch 'wip-MDL-18309-master' of git://github.com/marinaglancy/moodle
2015-04-15 09:54:36 +01:00
Simey Lameze
c7ccb543ac
MDL-46963 core_upgrade: change the call to guess_antelope_row_size
2015-04-15 15:01:19 +08:00
Simey Lameze
6592a11994
MDL-49844 core: add header to web page link
2015-04-15 14:33:07 +08:00
Frederic Massart
60de7df148
MDL-49800 core_output: Templates are not allowed in sub directories
2015-04-15 14:03:23 +08:00
David Monllao
e256b59702
Merge branch 'MDL-46963-master' of git://github.com/lameze/moodle
2015-04-15 13:35:37 +08:00
Andrew Nicols
12a9ae5c97
Merge branch 'MDL-49551_master' of git://github.com/markn86/moodle
2015-04-14 15:32:17 +08:00
Dan Poltawski
ce54688f8e
Merge branch 'MDL-49723-master' of git://github.com/lameze/moodle
2015-04-14 15:32:16 +08:00
Dan Poltawski
0627d5802c
Merge branch 'wip-MDL-45774-master' of git://github.com/abgreeve/moodle
2015-04-14 15:32:13 +08:00
Andrew Nicols
80b4868a50
Merge branch 'MDL-49762_master' of git://github.com/nadavkav/moodle
2015-04-14 15:32:11 +08:00
Andrew Nicols
69c150cbda
MDL-49840 testing: Always call composer install
2015-04-14 11:26:53 +08:00
Mark Nelson
17a3781259
MDL-49551 core_dml: deprecated set_logging()
2015-04-13 19:30:08 -07:00
Adrian Greeve
6e918b6437
MDL-45774 navigation: General fixes for the user navigation.
2015-04-13 15:54:24 +08:00
Adrian Greeve
72324523ad
MDL-45774 navigation: Version bump and upgrade.php edit.
2015-04-13 15:31:23 +08:00
Frederic Massart
08cb34a5a6
MDL-49819 profile: Move email to top and interests to lower location
2015-04-13 15:31:22 +08:00
Adrian Greeve
ee8ad79fe0
MDL-49819 navigation: My courses no longer active but still expanded.
...
The 'My courses' link in the navigation tree is expanded but no longer
active on the dashboard screen.
Part of MDL-45774.
2015-04-13 14:41:55 +08:00
Adrian Greeve
3a13707a0a
MDL-49819 navigation: Admin section in user profile update.
...
The Admin section will now only show when the admin or someone
with similar capabilities views the user profile. The edit profile
link has also been moved.
Part of MDL-45774.
2015-04-13 14:41:24 +08:00
Simey Lameze
9b8104ce9b
MDL-46963 environment: add check for antelope row format
2015-04-13 14:18:12 +08:00
Andrew Nicols
f3cd1624c3
MDL-49828 timezones: Correct typo in unit tests
2015-04-13 11:08:38 +08:00
Andrew Nicols
dfa966c710
Merge branch 'wip_MDL-49828_m29_tz3' of https://github.com/skodak/moodle
2015-04-13 11:01:25 +08:00
Petr Skoda
980a3a12ce
MDL-49828 timezones: add tests for DST switching
2015-04-12 15:23:08 +12:00
Petr Skoda
91bafd76f5
MDL-49828 timezones: improve settings performance
2015-04-12 12:38:06 +12:00
Petr Skoda
75a1e85e3a
MDL-49828 timezones: fix messed up phpunit detection
2015-04-12 12:37:32 +12:00
Petr Skoda
e49cb057a1
MDL-49828 timezones: fix typos introduced by MDL-49684
2015-04-12 12:11:10 +12:00
Adrian Greeve
f81893572c
MDL-49819 navigation: Added grades back to admin block.
...
Students can once again see the grades in the admin block
When navigating a course.
Part of MDL-45774.
2015-04-10 17:22:55 +08:00
Damyon Wiese
5d25a2cbe9
MDL-49412 User Navigation: Behat fixes for editors
...
Part of MDL-45774
2015-04-10 17:18:24 +08:00
Damyon Wiese
6bdc788054
MDL-45774 Navigation: Hide the second dashboard node from the navbar
2015-04-10 17:18:23 +08:00
Ankit Agarwal
07820cea4a
MDL-49412 navigation: Remove redundant reports node
...
Part of MDL-45774.
2015-04-10 17:18:22 +08:00
Ankit Agarwal
7a437e3661
MDL-49412 behat: I am on site homepage behat step
...
Part of MDL-45774.
2015-04-10 17:18:22 +08:00
Damyon Wiese
7b05a0feb6
MDL-49412 Behat: Add a 'I follow "x" in the user menu step'
...
Part of MDL-45774.
2015-04-10 17:18:22 +08:00
Damyon Wiese
5472f9f4e0
MDL-45774 Navigation: Add upgrade step to change defaulthomepage
2015-04-10 17:18:21 +08:00
Adrian Greeve
efd32edbee
MDL-45774 navigation: Deprecation of useredit_shared_definition_preferences.
2015-04-10 17:18:04 +08:00
Adrian Greeve
45367bdf0c
MDL-49688 navigation: First review fixes and version bump.
...
Part of MDL-45774.
2015-04-10 17:18:03 +08:00
Ankit Agarwal
b19cc4ef25
MDL-45898 myprofile: Redesign my profile page
...
Part of MDL-45774.
Contributions by John Okely, Jetha Chan and Damyon Wiese (squashed branch).
AMOS BEGIN
CPY [coursebadges,core_badges], [badges,core_badges]
AMOS END
2015-04-10 17:17:32 +08:00
Damyon Wiese
479fa47d0b
MDL-49632 User preferences: Move preferences out of edit profile form.
...
This is a super confusing place to change your default text editor. Lets
make these things easy to find.
Part of MDL-45774
2015-04-10 17:17:08 +08:00
Adrian Greeve
c78dbe03fb
MDL-49634 navigation: My grades now relevant to teachers.
...
My grades was originally only showing grades to a student.
Now the report will also show teachers what courses they are
teachers in.
Part of MDL-45774.
2015-04-10 17:17:08 +08:00
Adrian Greeve
ace9bde851
MDL-49605 navigation: Permissions updated for blog preferences.
...
Permissions are now being checked before displaying a link to blog
preference pages.
Part of MDL-45774.
2015-04-10 17:17:08 +08:00
Damyon Wiese
4e1f60478a
MDL-49635 Navigation: Site pages consistent headers + navigation for preferences
...
Preferences pages cancel and continue buttons should lead back to preferences page.
Site pages should have consistent headers and breadcrumbs.
Hide the "Preferences" node in the navigation.
Part of MDL-45774
2015-04-10 17:17:07 +08:00
Adrian Greeve
f495187da7
MDL-48935 navigation: Update the user nav breadcrumbs.
...
Part of MDL-45774.
2015-04-10 17:17:07 +08:00
Adrian Greeve
e42fb2dddf
MDL-48931 navigation: Update to context header renderer.
...
Update to the context_header render to include the messaging
JavaScript. Also updates to profile pages to remove duplicated
code.
Part of MDL-45774
2015-04-10 17:17:07 +08:00
Damyon Wiese
e4522f8841
MDL-48934 navigation: Update the default entries in the user menu.
...
Add mypreferences and remove mybadges and myfiles (You should get to the
last 2 through your dashboard).
Part of MDL-45774
2015-04-10 17:17:07 +08:00
Adrian Greeve
3b927d357b
MDL-45896 navigation: CSS and renderer improvements.
...
Part of MDL-45774.
2015-04-10 17:17:06 +08:00
