978 Commits

Author SHA1 Message Date
Dan Poltawski
da916029ba Merge branch 'MDL-45256-master' of git://github.com/FMCorz/moodle 2014-04-30 15:48:17 +08:00
Frederic Massart
8cf55094af MDL-45256 portfolio: Adding missing global in testcase 2014-04-30 15:32:23 +08:00
Marina Glancy
6032ae0f13 Merge branch 'MDL-43557_master' of git://github.com/markn86/moodle 2014-04-30 15:12:31 +08:00
Dan Poltawski
63c6df66c3 Merge branch 'MDL-45256-master' of git://github.com/FMCorz/moodle 2014-04-30 14:58:56 +08:00
Mark Nelson
02a5a4b2ff MDL-43557 events: fixed minor issues in existing events 2014-04-29 19:16:11 -07:00
Eloy Lafuente (stronk7)
f500ff4e52 MDL-45221 Allow unit tests to pass under any OS
This commit gets rid of the old lib/tests/other/executable.php
file completely because it was only executable under unix OSs
and moves the check to be performed against some mimetex binaries
that are known to be executable and bundled with every installation.

Note this was discovered because the weekly rolling process changed
the execution permissions of the "fixture" file and, at the end
we decided to get rid of it completely, folowing the plan above.
2014-04-29 19:22:54 +02:00
Eloy Lafuente (stronk7)
7c02f52a0e NOBUG: Fixed file access permissions 2014-04-29 15:14:21 +02:00
Frederic Massart
94545c73f1 MDL-45256 portfolio: Unit tests for rewrite pluginfile urls 2014-04-29 17:43:44 +08:00
Sam Hemelryk
4299dc5bb6 Merge branch 'MDL-45221-master' of git://github.com/andrewnicols/moodle 2014-04-29 09:10:05 +12:00
Andrew Nicols
9cd7bb3764 MDL-45221 admin: configexecutable admin settings should only accept files 2014-04-28 12:21:21 +08:00
Petr Skoda
8dcb7ae62e MDL-45128 include only education related events from real users in statistics processing 2014-04-28 11:31:31 +08:00
Marina Glancy
3ebfb87878 Merge branch 'w17_MDL-45219_m27_addtolog' of git://github.com/skodak/moodle 2014-04-23 15:25:01 +08:00
Marina Glancy
cae96c6217 Merge branch 'wip-MDL-45218-master' of git://github.com/abgreeve/moodle 2014-04-23 14:33:12 +08:00
Dan Poltawski
f58add15b1 Merge branch 'wip-MDL-45148-master' of https://github.com/mackensen/moodle 2014-04-23 14:22:17 +08:00
Marina Glancy
cc2c7d6767 Merge branch 'MDL-44991-master' of git://github.com/sammarshallou/moodle 2014-04-23 13:24:54 +08:00
Adrian Greeve
75cab92b19 MDL-45218 events: Unit tests and fixtures for new static methods in base event class. 2014-04-23 12:14:33 +08:00
Petr Skoda
dce7ec41e9 MDL-45219 add course recent_activity_viewed event 2014-04-23 11:53:36 +08:00
Adrian Greeve
7c084af93d MDL-45216 events: Unit tests for core/event/manager.
This includes unit tests for the new method get_all_observers
and updates to other methods that have been updated.
2014-04-23 11:51:08 +08:00
Petr Skoda
cd25119e34 MDL-45203 implement new event user_password_updated 2014-04-23 09:51:57 +08:00
Petr Skoda
0cd189bdf3 MDL-41185 fix url in course_viewed event after course deleted
Includes a minor fix for course invalidation after deleting of course,
this improvement should not affect normal execution, that is why
it was not backported.
2014-04-22 11:52:37 +08:00
Petr Skoda
f49151c30b MDL-41185 cleanup course viewed events
Thanks Marina for spotting some of the issues.
2014-04-21 18:12:53 +08:00
Adrian Greeve
68a7235889 MDL-41185 events: Added events for different course view pages 2014-04-21 17:39:18 +08:00
Dan Poltawski
3bc5fbebc5 Merge branch 'MDL-39607-master' of git://github.com/FMCorz/moodle 2014-04-18 11:10:39 +08:00
Dan Poltawski
63476b0f6f Merge branch 'MDL-44619_master' of git://github.com/dmonllao/moodle 2014-04-17 17:02:04 +08:00
Frederic Massart
970c44196c MDL-39607 theme: Update Moodle logo 2014-04-17 14:33:39 +08:00
Charles Fulton
2f9c7f45dc MDL-45148 unit testing: pass role id instead of user id 2014-04-16 20:46:00 -07:00
Frederic Massart
218d751d07 MDL-45132 curl: Unit Tests for file uploads 2014-04-16 17:29:22 +08:00
Dan Poltawski
4916184896 Merge branch 'MDL-44349-master' of https://github.com/lucisgit/moodle 2014-04-16 15:11:27 +08:00
Dan Poltawski
c312e59e7d Merge branch 'wip-mdl-44979' of https://github.com/rajeshtaneja/moodle 2014-04-16 13:56:37 +08:00
Damyon Wiese
63c61733f0 MDL-45062 webservices: fix unit test for update_grades
This fixes the broken unit test (which exposes a fail) and
the next patch from Juan fixes the fail.
2014-04-16 10:55:58 +08:00
Damyon Wiese
0cbd1f913d Merge branch 'MDL-45055-master' of git://github.com/ankitagarwal/moodle 2014-04-16 10:41:17 +08:00
Frederic Massart
f0031a7c15 MDL-44941 core: Removing irrelevant assertion causing failures
The timemodified property is not called when the user logs in, and
so we should not be checking if its value matches the current time.
2014-04-15 17:25:47 +08:00
Marina Glancy
300735e95e Merge branch 'w16_MDL-44911_m27_unknownevent' of git://github.com/skodak/moodle 2014-04-14 17:09:49 +08:00
Petr Škoda
d409944a95 MDL-44911 use unknown_logged class when viewing unknown events in reports 2014-04-14 11:59:00 +08:00
Ankit Agarwal
9634712a37 MDL-45055 events: Add debugging notice to events_trigger() 2014-04-14 11:51:37 +08:00
Damyon Wiese
390365e696 Merge branch 'MDL-44936-master' of git://github.com/FMCorz/moodle 2014-04-14 11:38:46 +08:00
sam marshall
90c3ffe3a3 MDL-44991 Behat: step to check if attribute does not contain text
The step checks that an attribute exists, but doesn't contain the
specified text.

Example:
Then the "class" attribute of "#mydiv" "css_element" should
not contain "accesshide"
2014-04-11 11:00:25 +01:00
Frederic Massart
eddc1461f8 MDL-44936 csslib: Chunking supports @media queries and commas in rules 2014-04-11 12:05:00 +08:00
Rajesh Taneja
92a34f2865 MDL-44979 behat: no need to purge all cache again 2014-04-10 11:00:40 +08:00
David Monllao
af4830a257 MDL-44619 behat: Converting MDLQA-8
In a standard forum, students can start discussions
add replies and attach files to their posts.
2014-04-09 19:34:11 +07:00
Damyon Wiese
515fe565f6 Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle
Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php
2014-04-08 13:30:41 +08:00
Marina Glancy
aaba0d56e2 Merge branch 'MDL-44891-master' of git://github.com/sammarshallou/moodle 2014-04-08 11:13:17 +08:00
Marina Glancy
efa6ee356b Merge branch 'MDL-44954' of git://github.com/jleyva/moodle 2014-04-08 08:34:24 +08:00
sam marshall
8d1f33e122 MDL-44070 Conditional availability enhancements (6): core changes
Changes core code to use new API instead of the old one when
checking user access to activities and sections.

Includes changes to other libraries that are necessary after
adding the availability system and removing old conditional tables
etc.
2014-04-07 20:11:48 +01:00
sam marshall
6a601097a0 MDL-44070 Conditional availability enhancements (5): deprecate old lib
The old conditionlib.php, which is replaced by the new availability
API, has been deprecated.

* Code which uses the key functions (is_available,
  get_full_information) should still work. These now show
  deprecated warnings and then pass through to equivalents in the
  new API.
* I have created new unit tests for these functions.
* The old language file has been removed (reused strings already
  moved with AMOS).
* Most other functions throw exceptions because it was impossible
  (due to fundamental API differences) or difficult to reimplement.
* I don't really expect that non-core code (outside unit tests) will
  have used any of the other functions.
2014-04-07 20:11:45 +01:00
sam marshall
8e97006ad0 MDL-44070 Conditional availability enhancements (1): DB upgrade
Converts existing data to new structure in database as part of
upgrade, including a progress bar.

Deletes the database tables and fields that were used by the old
system and are no longer needed.
2014-04-07 18:27:43 +01:00
Juan Leyva
5e12b369af MDL-44954 messages: Fixed save notifications with the notification flag 2014-04-07 12:19:52 +02:00
Marina Glancy
502ff062a0 Merge branch 'wip-mdl-44873' of git://github.com/rajeshtaneja/moodle 2014-04-07 16:16:25 +08:00
Sam Hemelryk
292dcf047f MDL-41551 blocks: added tracking and recognition of custom block regions 2014-04-06 15:17:47 +12:00
sam marshall
15c8c47401 MDL-44891 Behat: Add step to check attribute
This commit creates a Behat step of the form:

Then the "title" attribute of "Toggle visibility" "button"
should contain "Show"

This is useful because unless I missed something there is currently
no step that checks attribute values; this seems like a simple
generic step. Behat is intended to check user-visible effects in
the resulting HTML, and sometimes these effects are implemented
using attribute values (two common examples are the alt= attribute,
which is visible to screenreader users, and the title= attribute,
which is visible to all users; there's also the src attribute of
images, and lots of other possibilities too).
2014-04-04 18:17:39 +01:00