Commit graph

5369 commits

Author SHA1 Message Date
Sam Hemelryk
46921d74a6 Merge branch 'MDL-44323-master' of git://github.com/danpoltawski/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-05-20 15:42:32 +12:00
Damyon Wiese
cf229a526c Merge branch '44974-28' of git://github.com/samhemelryk/moodle 2014-05-20 08:49:56 +08:00
Sam Hemelryk
4dc5c77f33 Merge branch 'MDL-45477-master' of https://github.com/sammarshallou/moodle 2014-05-20 11:58:12 +12:00
Simon Coggins
9811cb650c MDL-45623: Fix assigned users count on role delete confirmation page 2014-05-20 10:01:00 +12:00
Tim Hunt
5bcfd504df MDL-45618 Fix @since PHPdoc tags. 2014-05-19 17:03:04 +01:00
Sam Hemelryk
12890c57f2 MDL-44974 admin: repositioned call to initialise renderer 2014-05-19 08:41:29 +12:00
Dan Poltawski
376a17e4ae MDL-44323 admin: use correct css class for warning
The notifyproblem notification is consistent with the rest of
the warnings we report.
2014-05-15 12:00:11 +08:00
sam marshall
2164bd723a MDL-45477 Behat: List of steps takes too long to load, times out
Increase time limit to 300 seconds (5 minutes).
2014-05-14 11:06:51 +01:00
Juan Leyva
a4496bdde9 MDL-36670 logging: action parameter length restricted to 40 chars 2014-05-13 16:05:39 +02:00
Marina Glancy
f094167bef MDL-45486 Bump all versions to planned release 2014-05-09 10:50:39 +08:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
2014-05-09 02:12:28 +02:00
Marina Glancy
f69c0d572e Merge branch 'MDL-45398-master' of git://github.com/sammarshallou/moodle 2014-05-08 12:04:53 +08:00
sam marshall
59d585d135 MDL-45398 Manage availability restrictions: Show/hide not working
The show/hide icons were not working correctly. In addition, the
report still displayed even when availability feature was turned
off.

As well as fixing them, I added a Behat test to cover this report.
2014-05-07 10:15:27 +01:00
Andrew Nicols
02915dfc23 MDL-45357 events: Remove unnecessary the before 'id' in event descriptions 2014-05-06 16:45:05 +08:00
Damyon Wiese
0c3e0f4752 Merge branch 'MDL-45329-master' of git://github.com/andrewnicols/moodle 2014-05-01 12:29:55 +08:00
Andrew Nicols
f12f34166d MDL-45329 admin_task: Allow scheduled task change prevention
Some hosting providers have a requirement to prevent users making
modifications to the configuration of scheduled tasks as doing so may have
a negative impact not only on their own site, but also on the performance
of other sites (depending on host configuration). For example, if the
statistics or automated backup tasks were run every minute, this could have
a negative impact for other users).
2014-05-01 11:40:25 +08:00
Mark Nelson
02a5a4b2ff MDL-43557 events: fixed minor issues in existing events 2014-04-29 19:16:11 -07:00
Mark Nelson
e692f58558 MDL-43557 events: removed underscores from event string keys
AMOS START
 MOV [event_legacy_logged, logstore_legacy],[eventlegacylogged,logstore_legacy]
 MOV [event_cohort_created,cohort],[eventcohortcreated,cohort]
 MOV [event_cohort_deleted,cohort],[eventcohortdeleted,cohort]
 MOV [event_cohort_member_added,cohort],[eventcohortmemberadded,cohort]
 MOV [event_cohort_member_removed,cohort],[eventcohortmemberremoved,cohort]
 MOV [event_cohort_updated,cohort],[eventcohortupdated,cohort]
 MOV [event_group_created,group],[eventgroupcreated,group]
 MOV [event_group_deleted,group],[eventgroupdeleted,group]
 MOV [event_group_member_added,group],[eventgroupmemberadded,group]
 MOV [event_group_member_removed,group],[eventgroupmemberremoved,group]
 MOV [event_group_updated,group],[eventgroupupdated,group]
 MOV [event_grouping_created,group],[eventgroupingcreated,group]
 MOV [event_grouping_deleted,group],[eventgroupingdeleted,group]
 MOV [event_grouping_updated,group],[eventgroupingupdated,group]
 MOV [event_webservice_function_called,webservice],[eventwebservicefunctioncalled,webservice]
 MOV [event_webservice_login_failed,webservice],[eventwebserviceloginfailed,webservice]
 MOV [event_webservice_service_created,webservice],[eventwebserviceservicecreated,webservice]
 MOV [event_webservice_service_deleted,webservice],[eventwebserviceservicedeleted,webservice]
 MOV [event_webservice_service_updated,webservice],[eventwebserviceserviceupdated,webservice]
 MOV [event_webservice_service_user_added,webservice],[eventwebserviceserviceuseradded,webservice]
 MOV [event_webservice_service_user_removed,webservice],[eventwebserviceserviceuserremoved,webservice]
 MOV [event_webservice_token_created,webservice],[eventwebservicetokencreated,webservice]
 MOV [event_webservice_token_sent,webservice],[eventwebservicetokensent,webservice]
 MOV [event_user_loggedin,auth],[eventuserloggedin,auth]
 MOV [event_assessable_uploaded,assignsubmission_file],[eventassessableuploaded,assignsubmission_file]
 MOV [event_assessable_uploaded,assignsubmission_onlinetext],[eventassessableuploaded,assignsubmission_onlinetext]
 MOV [event_chapter_created,mod_book],[eventchaptercreated,mod_book]
 MOV [event_chapter_deleted,mod_book],[eventchapterdeleted,mod_book]
 MOV [event_chapter_updated,mod_book],[eventchapterupdated,mod_book]
 MOV [event_chapter_viewed,mod_book],[eventchapterviewed,mod_book]
 MOV [event_book_exported,booktool_exportimscp],[eventbookexported,booktool_exportimscp]
 MOV [event_book_printed,booktool_print],[eventbookprinted,booktool_print]
 MOV [event_chapter_printed,booktool_print],[eventchapterprinted,booktool_print]
 MOV [event_message_sent,mod_chat],[eventmessagesent,mod_chat]
 MOV [event_sessions_viewed,mod_chat],[eventsessionsviewed,mod_chat]
 MOV [event_answer_created,mod_choice],[eventanswercreated,mod_choice]
 MOV [event_answer_updated,mod_choice],[eventanswerupdated,mod_choice]
 MOV [event_report_viewed,mod_choice],[eventreportviewed,mod_choice]
 MOV [event_assessable_uploaded,mod_forum],[eventassessableuploaded,mod_forum]
 MOV [event_assessable_uploaded,mod_workshop],[eventassessableuploaded,mod_workshop]
AMOS END
2014-04-29 19:15:47 -07:00
Marina Glancy
e8277bd886 Merge branch 'MDL-45156_master' of git://github.com/dmonllao/moodle 2014-04-28 18:01:15 +08:00
David Monllao
caf02d3d02 MDL-45156 behat: Changing html_writer::empty_tag for start_tag
Also reducing the heading size.

Credits to Daniele Cordella.
2014-04-27 16:14:34 +07:00
Petr Skoda
b33da4bfe3 MDL-45250 add debugging message to deprecated add_to_log() 2014-04-25 15:29:58 +08:00
Sam Hemelryk
ecb98f6ecd Merge branch 'w17_MDL-45214_m27_idsortlog' of https://github.com/skodak/moodle 2014-04-24 11:10:46 +12:00
Petr Skoda
a8d7d6175a MDL-45214 always try to use ID sort in get_events_select()
This should make PostgreSQL behave more like MySQL
and resolve the problem when events were appearing in different
order.
2014-04-23 15:29:35 +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
Petr Skoda
db473c0d5a MDL-45219 add report_viewed event to tool_capability 2014-04-23 11:53:35 +08:00
Ankit Agarwal
a3cfbccd49 MDL-44950 logstore_database: Make all settings positive for usability 2014-04-22 11:39:03 +08:00
Simey Lameze
da223c11a5 MDL-44990 logging: Capabilites removed from legacy and standard log. 2014-04-17 15:50:59 +08:00
Dan Poltawski
36b5096e59 Merge branch 'wip-mdl-44977' of https://github.com/rajeshtaneja/moodle 2014-04-16 14:34:58 +08:00
Sam Hemelryk
d4449f2f17 Merge branch 'wip-MDL-44998-master' of git://github.com/marinaglancy/moodle 2014-04-16 09:46:54 +12:00
Marina Glancy
c733401634 Merge branch 'MDL-45035-master' of git://github.com/ankitagarwal/moodle 2014-04-15 14:34:36 +08:00
Marina Glancy
72aeb83a74 MDL-44998 log_standard: review indexes 2014-04-15 12:25:48 +08:00
Petr Škoda
5d2abe72a2 MDL-44910 enable new logging during upgrade and installation
The legacy logging is now enabled for reading only
if legacy log data older than one day exists.
2014-04-14 09:43:40 +08:00
Ankit Agarwal
3610ad436c MDL-45035 events: Fix @package and @since tags in Moodle 2.7 events 2014-04-11 13:45:33 +08: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
Damyon Wiese
1e16a58525 Merge branch 'wip-MDL-22999-m27' of https://github.com/jamesmcq/moodle 2014-04-08 10:09:21 +08:00
James McQuillan
597662335d MDL-22999 core_grades: Added ability to configure maximum grade value both globally and for each graded-activity. 2014-04-07 16:02:37 -04: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
d3db4b037c MDL-44070 Conditional availability enhancements (2): subsystem, API
This commit defines the new /availability root folder, with
/availability/classes, /availability/tests, and
/availability/condition where the condition plugins will live.
Condition plugin prefix is availability_, e.g. availability_date.

Rationale for this organisation:

1. I was originally going to put this in /lib/availability but
   it has been pointed out that putting even more junk in lib
   is probably bad.
2. 'availability' and 'condition' are the two names used in code
   to refer to this system ($CFG->enableavailability).
3. The prefix has to be short enough to allow database tables
   (although in practice I assume that condition plugins will not
   normally contain database tables).

The new API includes a Boolean tree structure that controls the
availability of an item.

AMOS BEGIN
 CPY [availabilityconditions,core_condition],[restrictaccess,core_availability]
 CPY [enableavailability,core_condition],[enableavailability,core_availability]
 CPY [configenableavailability,core_condition],[enableavailability_desc,core_availability]
AMOS END
2014-04-07 20:11:33 +01:00
Rajesh Taneja
22001b4a9b MDL-44977 tool_profiling: set xhprof default settings
Set xhprof default settings, even if xhprof is not installed.
If xhprof is not installed, hide profiling admin settings,
else show them.
This is needed, because if xhprof is installed, then it will
fail all non-js behats which navigate to setting under
site administration, as profiling settings get displayed on
default admin page.
2014-04-07 14:55:55 +08:00
Petr Škoda
1a361486a9 MDL-44882 always set maintenance mode on non-cached admin pages
This should resolve all issues with themes during upgrades.
2014-04-06 20:37:55 +08:00
Sam Hemelryk
3ed2a4b2cc Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle 2014-04-02 13:04:46 +13:00
Ankit Agarwal
52dc1de746 MDL-42891 administration: Re-implement incorrect login notification, without using the logtable. 2014-04-01 17:18:15 +08:00
Petr Škoda
246230715e MDL-44733 add disabled class rows with disabled scheduled tasks 2014-03-31 15:48:19 +08:00
Petr Škoda
0a5aa65b53 MDL-44733 add support for disabling of scheduled tasks 2014-03-28 10:23:37 +08:00
Petr Škoda
c7e5683a7e MDL-44824 add missing subplugin type names 2014-03-27 11:59:26 +08:00
Ankit Agarwal
16e59c6af8 MDL-44596 logging: Refecator code to use component_callback() and get_plugin_list_with_function() 2014-03-26 09:50:41 +08:00
Ankit Agarwal
96c8d59dea MDL-44596 logging: Add some tests to log stores to test the new support methods 2014-03-26 09:12:43 +08:00
Ankit Agarwal
f0a0f3c2bd MDL-44596 logging: Improve management interfaces for reports and stores
This patch methods to the manager that uses callbacks from reports to determine how reports and stores are compatible with each other. This information is then displayed in the management pages.
2014-03-26 09:12:42 +08:00
Eloy Lafuente (stronk7)
c56e0192ef Merge branch 'w13_MDL-44510_m27_phpunit4' of https://github.com/skodak/moodle 2014-03-25 21:03:44 +01:00
Andrew Nicols
1f777e5c6c MDL-41987 Javascript: Tidy up YUI documentation 2014-03-25 17:01:37 +08:00