mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
73,461 Commits 36 Branches 519 Tags
Commit Graph

5361 Commits

Author SHA1 Message Date
Adrian Greeve
a19c4b8dd0 MDL-50039 tool_monitor: Behat update to fix selection error 2015-05-07 13:13:04 +08:00
Adrian Greeve
0f510be763 MDL-50039 tool_monitor: Additional checks for subscription. 
Additional capability checks are now in place to stop unauthorised
users from accessing the event monitor subscription page.

Thanks to Eloy Lafuente for creating a gist with ideas of tackling
No site level capability to the rule subscription.
 2015-05-07 13:13:04 +08:00
Dan Poltawski
57fc76ab92 Merge branch 'MDL-50102' of git://github.com/stronk7/moodle 2015-05-06 10:50:35 +01:00
Damyon Wiese
917bd02be5 MDL-49870 tool_templatelibrary: Allow docs in parent template only. 
If the mustache comment containing the docs for the template is
not found in the theme overridden template, search the original
core/plugin template for the docs.
 2015-05-06 14:54:56 +08:00
Eloy Lafuente (stronk7)
26ea380d24 MDL-50102 versions: bump all versions and requires near release 
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
 2015-05-05 17:43:19 +02:00
Damyon Wiese
410034eef0 MDL-50085 templates: Minor fixes from peer review 
* rename get_filename to get_filepath
* phpdocs fixes
* improve formatting of exceptions
* lang string improvement
 2015-05-05 03:19:39 +02:00
Damyon Wiese
fcc383db0f MDL-50085 Mustache : Strictly define the search paths for templates. 
This change moves several repeated sections of code that was searching
for templates and valid template locations to a new class. It adds
unit tests for the new class and verifies subsystem support for templates.
 2015-05-05 03:19:25 +02:00
David Monllao
9996e8954b Merge branch 'wip-MDL-49846-master-fix' of git://github.com/abgreeve/moodle 2015-05-04 14:57:18 +08:00
David Monllao
3994812f38 Merge branch 'wip-mdl-50042' of git://github.com/rajeshtaneja/moodle 2015-05-04 14:16:09 +08:00
Adrian Greeve
bdf899a503 MDL-49846 tool_monitor: Context simplification and clean up. 
Removed some unnecessary variables and simplified the context
usage in the index.php page.
 2015-05-04 14:05:44 +08:00
Andrew Nicols
6e9abef568 Merge branch 'MDL-49983-master' of git://github.com/xow/moodle 2015-05-04 12:39:48 +08:00
John Okely
4887d15228 MDL-49983 navigation: Remove 'my' from user context navigation 2015-05-04 12:38:50 +08:00
Adrian Greeve
19452c99d7 MDL-49846 tool_monitor: Subscription page now filters on site events. 2015-05-04 12:29:54 +08:00
David Monllao
600596fd6a Merge branch 'MDL-49840-master' of git://github.com/andrewnicols/moodle 2015-05-01 11:05:59 +08:00
Rajesh Taneja
7fb84d75ee MDL-50042 behat: Use double quotes to avoid symfony adding it 2015-04-30 16:42:11 +08:00
Frederic Massart
ca6f3a8b5f MDL-49911 admin: Prevent notices when updatenotifications is disabled 2015-04-28 10:13:36 +01:00
Dan Poltawski
6e28c039cb Merge branch 'MDL-49956_getstring' of https://github.com/andyjdavis/moodle 2015-04-27 11:03:32 +01:00
Andrew Davis
28343f0e12 MDL-49956 admin: removed unused get_string() params 2015-04-24 08:33:38 +08:00
Frederic Massart
e14388e3a7 MDL-49972 preferences: Fix incorrect title and headings 2015-04-23 16:05:00 +08:00
Andrew Nicols
6866527275 MDL-40811 uploaduser: Optimise testuser code 2015-04-21 11:34:00 +08:00
Andrew Nicols
7464939f6d Merge branch 'MDL-40881_master' of https://github.com/nadavkav/moodle 2015-04-21 11:17:16 +08:00
Rajesh Taneja
0fe86bbdbb MDL-49799 behat: replaced asd.com with example.com 
asd.com is a valid domain, we should use reserved domain names for testing
 2015-04-20 11:21:20 +08:00
Rajesh Taneja
f8b71928d2 MDL-49456 behat: Use proper dir separator to support different os 2015-04-17 11:48:37 +08: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
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
a910e3885a MDL-49840 testing: Ensure that composer dependencies are updated 
We should ensure that composer dependencies are present before running
phpunit and behat. We should also ensure that they match the versions in
the composer.lock file.

Doing so ensures that we have a consistency across the board amongst
testers. All testers are a specific commit will be using the same version
of composer.lock and the same version of the relevant tools.
 2015-04-16 09:00:03 +08:00
David Monllao
e256b59702 Merge branch 'MDL-46963-master' of git://github.com/lameze/moodle 2015-04-15 13:35:37 +08:00
Rajesh Taneja
78429cc7ef MDL-45774 behat: Fixed button name to be pressed 2015-04-14 15:32:18 +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
Nadav Kavalerchik
ada407159f MDL-40881 uploaduser: Validate profile fields unique values 2015-04-13 21:42:26 +03:00
Adrian Greeve
6e918b6437 MDL-45774 navigation: General fixes for the user navigation. 2015-04-13 15:54: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
dfa966c710 Merge branch 'wip_MDL-49828_m29_tz3' of https://github.com/skodak/moodle 2015-04-13 11:01:25 +08:00
Petr Skoda
91bafd76f5 MDL-49828 timezones: improve settings performance 2015-04-12 12:38:06 +12:00
Damyon Wiese
46a2fbc4b7 MDL-49412 Navigation: Remaining behat fixed for nav branch 
Behat is passing after this change.

Part of MDL-45774.
 2015-04-10 17:19:28 +08:00
Adrian Greeve
8e94fae962 MDL-49412 behat: Update to tool behat tests. 
Part of MDL-45774.
 2015-04-10 17:18:24 +08:00
Adrian Greeve
f3a493debe MDL-49412 tool_monitor: Minor fixes to stop errors. 
Part of MDL-45774.
 2015-04-10 17:18:24 +08:00
Adrian Greeve
f6564aa450 MDL-49412 behat: Update to core_admin behat tests. 
Part of MDL-45774.
 2015-04-10 17:18:22 +08:00
Adrian Greeve
25c634df29 MDL-49726 navigation: Update event monitor subscription. 
It is now possible for users with the right permissions
to subscribe to events. The link is on the preferences page.

Part of MDL-45774.
 2015-04-10 17:18:22 +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
Adrian Greeve
e5cfbeea76 MDL-49630 admin: defaulthomepage changed to dashboard. 
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
880c50731f MDL-48930 navigation: Using user headers in user pages. 
Pages that are percieved to be in a user context are now
using a user context for the header.

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
Damyon Wiese
19b2179e94 MDL-45894 navigation: New setting had null default (shows on new install page) 
Change default to ''

Part of MDL-45774
 2015-04-10 17:17:06 +08:00
Adrian Greeve
c9451960e3 MDL-45894 navigation: My grades update to overview report. 
Part of MDL-45774
 2015-04-10 17:17:05 +08:00