Dan Poltawski
02852c45b5
Merge branch 'MDL-36002-master-fix1' of git://github.com/damyon/moodle
2013-08-14 14:51:31 +08:00
Damyon Wiese
70b4027b52
MDL-36002 javascript: Fix keyboard drag/drop not opening win
...
This was caused by changes in MDL-39851.
2013-08-14 14:49:13 +08:00
Dan Poltawski
178d901cf9
MDL-41019 bump redirect_if_major_upgrade_required()
2013-08-14 14:24:30 +08:00
Damyon Wiese
fdfaa5a586
MDL-39851 javascript: Add behat fix for filepicker
...
The filepicker was changed to use M.core.dialogue - this
patch updates the behat suite to search the changed dom for
the file picker windows closed event.
2013-08-14 11:15:41 +08:00
Frederic Massart
25a66af722
MDL-39956 cohort: Event clean up and made ready for integration
...
* Added more PHP Documentation
* Localised strings for get_name()
* get_legacy_eventname() is now static
* get_legacy_eventdata() is now protected
* Testing legacy event data
* Added missing defined('MOODLE_INTERNAL') checks
* Added missing call to add_record_snapshot()
2013-08-13 17:41:03 +08:00
Dan Poltawski
04aee04a25
MDL-39956 cohort: Convert to new events
...
* \core\event\cohort_created
* \core\event\cohort_updated
* \core\event\cohort_deleted
* \core\event\cohort_member_added
* \core\event\cohort_member_removed
2013-08-13 17:30:58 +08:00
Dan Poltawski
aae18d2af4
MDL-31836 upgrade.txt: add a note about encrypt change
2013-08-13 14:57:25 +08:00
Dan Poltawski
26e5090f9e
Merge branch 'wip-MDL-31836-m26' of git://github.com/samhemelryk/moodle
2013-08-13 14:57:23 +08:00
Dan Poltawski
f9b5915bc0
Merge branch 'MDL-39954-master' of git://github.com/FMCorz/moodle
2013-08-13 13:23:31 +08:00
Dan Poltawski
387d040b7b
Merge branch 'MDL-40668-master' of git://github.com/damyon/moodle
2013-08-13 11:14:37 +08:00
Damyon Wiese
0c0dfa8fbd
MDL-40668 tinymce: Remove collapsable editor options
...
We have an alternative (pdw toolbars)
Also, allow tinymce to be collapsed down to a single row.
2013-08-13 10:54:36 +08:00
Damyon Wiese
bf7c86cfcf
MDL-39851 M.core.dialogue: Various fixes
...
Items addressed
* Get rid of custom attribute srcNode
* Change extraClasses to a config only parameter.
* Change attribute fullscreen to a method.
* Restore the original window overflow value.
* Use setStyles instead of setStyle for performance.
* Tinymce end the zindex wars
* Prevent fullscreen dialogs in an iframe (tinymce managefiles plugin).
* tinymce: Cross browser fix for zindex on popups
* Use CSS for overflow changes (easier to keep track of the previous state).
* Fix Coding style for css changes
2013-08-13 10:42:01 +08:00
Damyon Wiese
c402943a33
MDL-39851 forms: Convert filemanager popups to M.core.dialogue
2013-08-13 10:39:36 +08:00
Damyon Wiese
d61c96b6b4
MDL-39851 javascript: Full screen dialogs on small screens
...
This change adds support to M.core.dialogue for showing fullscreen
dialogs on small screen sizes. There are 2 new configuration values that
can be set to control this when creating a dialog (responsive and responsiveWidth).
Setting responsive to false will disable this functionality completely (old behaviour).
Setting responsiveWidth controls the screen width that the dialog will switch to
fullscreen mode. Try not to think of the device that will be accessing the dialog,
but the width at which the content of the dialog needs to be displayed differently.
The activity chooser and the filepicker are the two dialogs that have been converted
in this patch. The filepicker first had to be converted to use M.core.dialog and not
Y.Panel.
2013-08-13 10:37:32 +08:00
Sam Hemelryk
969de2a200
Merge branch 'wip-mdl-39955' of git://github.com/rajeshtaneja/moodle
2013-08-13 14:13:13 +12:00
Rajesh Taneja
1cb1e5fe32
MDL-39955 completion: Added unittest for course_completed event
2013-08-13 09:43:38 +08:00
Rajesh Taneja
06f8ea7bf4
MDL-39955 completion: Added course_completed event
2013-08-13 09:43:38 +08:00
Sam Hemelryk
0c0efd71a1
Merge branch 'MDL-38191-master' of git://github.com/sammarshallou/moodle
2013-08-13 10:26:26 +12:00
Sam Hemelryk
49c7794dcf
Merge branch 'MDL-41082-master' of git://github.com/FMCorz/moodle
2013-08-13 10:16:14 +12:00
Sam Hemelryk
90fb4f39fd
Merge branch 'MDL-41100-master' of git://github.com/FMCorz/moodle
...
Conflicts:
version.php
2013-08-13 09:37:02 +12:00
Sam Hemelryk
6648f17384
Merge branch 'wip-MDL-41114-master' of git://github.com/marinaglancy/moodle
2013-08-13 09:32:48 +12:00
Sam Hemelryk
bbf434b639
Merge branch 'MDL-41050-master' of git://github.com/sammarshallou/moodle
2013-08-13 09:27:50 +12:00
Sam Hemelryk
23b7f1dfcf
Merge branch 'MDL-41033' of git://github.com/rwijaya/moodle
2013-08-13 09:24:12 +12:00
Sam Hemelryk
61f2c458d5
Merge branch 'MDL-40711-master' of git://github.com/ankitagarwal/moodle
2013-08-13 09:12:24 +12:00
Sam Hemelryk
41b0597855
Merge branch 'MDL-40852_master' of git://github.com/dmonllao/moodle
2013-08-13 09:10:28 +12:00
Sam Hemelryk
cd0103fa60
Merge branch 'MDL-40673_master' of git://github.com/dmonllao/moodle
2013-08-13 09:03:45 +12:00
Sam Hemelryk
97907a85f1
Merge branch 'MDL-35919-master' of git://github.com/phalacee/moodle
2013-08-13 08:36:01 +12:00
Sam Hemelryk
8e9709f8bf
Merge branch 'MDL-35934' of git://github.com/rwijaya/moodle
2013-08-13 08:33:12 +12:00
Petr Škoda
96f81ea385
MDL-39474 introduce $CFG->debugdeveloper and cleanup $CFG init
2013-08-12 13:01:47 +02:00
Dan Poltawski
88ce8a1cb0
Merge branch 'MDL-27655' of git://github.com/timhunt/moodle
2013-08-12 16:41:29 +08:00
Frederic Massart
e185f72d58
MDL-39954 core: Abstract event assessable_submitted & assessable_uploaded
2013-08-12 16:26:41 +08:00
Dan Poltawski
7064ef523b
Merge branch 'wip-mdl-40044' of git://github.com/rajeshtaneja/moodle
2013-08-12 14:27:35 +08:00
Dan Poltawski
cb1268b109
Merge branch 'MDL-41068' of https://github.com/mr-russ/moodle
2013-08-12 13:42:41 +08:00
Dan Poltawski
df8cd014be
Merge branch 'w33_MDL-41019_m26_langcaches' of https://github.com/skodak/moodle
2013-08-12 13:29:17 +08:00
Jason Fowler
baffb422e6
MDL-35919 - Activity Chooser - Adding Aria attributes to improve accessibility
2013-08-12 13:18:57 +08:00
Rossiani Wijaya
1b25169215
MDL-35934 Filemanager: change the set attribute to use setAttribute() instead of YUI set().
2013-08-12 12:28:03 +08:00
Kirill Astashov
faaf3f63c2
MDL-41122: Trim on RSS body to prevent Remote RSS block from failing on valid feeds
2013-08-12 13:38:59 +09:30
Dan Poltawski
f2b45ad65f
Merge branch 'MDL-36002-master' of git://github.com/damyon/moodle
...
Conflicts:
theme/base/style/core.css
theme/bootstrapbase/style/moodle.css
2013-08-12 11:56:37 +08:00
Sam Hemelryk
d3fb29877e
Merge branch 'w33_MDL-41086_m26_upgradecheck' of https://github.com/skodak/moodle
2013-08-12 14:23:10 +12:00
Sam Hemelryk
63106eae7f
Merge branch 'w33_MDL-41073_m26_needsupgrade' of https://github.com/skodak/moodle
2013-08-12 14:03:30 +12:00
Sam Hemelryk
8b7378cff0
Merge branch 'MDL-22236-master' of git://github.com/damyon/moodle
...
Conflicts:
version.php
2013-08-12 12:11:07 +12:00
Sam Hemelryk
61bec33f53
Merge branch 'MDL-31487' of git://github.com/timhunt/moodle
2013-08-12 11:02:48 +12:00
Sam Hemelryk
45f133884e
Merge branch 'MDL-36005-master' of git://github.com/damyon/moodle
...
Conflicts:
version.php
2013-08-12 10:38:06 +12:00
Sam Hemelryk
1f0608ed34
MDL-31836 moodlelib: removed legacy encryptkey support
2013-08-12 10:26:01 +12:00
Marina Glancy
e4008e9db5
MDL-41114 Speeding up course listings on large sites
...
- function coursecat::make_categories_list() does not use retrieved contexts and has to query them again.
- /course/manage.php uses field coursecat:: that was not fetched when retrieving the course category children.
2013-08-11 21:58:12 +10:00
Petr Škoda
598a82c950
MDL-41019 improve language caching
...
Includes:
* no more hacky reloads, everything is written only once and kept until cache reset
* lang menu list is now cached in MUC
* both string and lang menu caches are compatible with local caches on cluster nodes
* config-dist.php cleanup
2013-08-11 09:52:34 +02:00
Rajesh Taneja
35e4eb42c0
MDL-40044 Roles: Updated role_assigned and role_unassigned event to remove add_to_log
2013-08-09 18:02:02 +08:00
sam marshall
975f8442c9
MDL-38191 Backup/restore: Should use large memory limit
2013-08-09 11:01:14 +01:00
Rajesh Taneja
1613ffa55f
MDL-40044 Roles: Added role_allow_*_updated events to replace add_to_log on role allow page
...
Added events:
1. role_allow_assign_updated
2. role_allow_override_updated
3. role_allow_switch_updated
2013-08-09 17:59:54 +08:00
Rajesh Taneja
82ddcad0a3
MDL-40044 Roles: Added role_capabilites_updated event and replaced related add_to_log
2013-08-09 17:59:54 +08:00