mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-12 12:05:14 +02:00
Code Issues Projects Releases Wiki Activity
86,937 Commits 36 Branches 531 Tags
Commit Graph

86937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Reischmann
34eb2faa0d MDL-27886 backup: Decision if a setting is fixed based on level 
Previously, when a during backup/restore the "Schema"-stage is loaded,
some settings are fixed if they are LOCKED_BY_HIERARCHY. However, user
data fields of activities can be locked, when the section they are
contained in has user data set to false. When this setting is changed on
the same screen, the fixed setting of the activity can not be "unfixed"
by javascript.

This patch adds a settings-level to the call of is_changeable. With this
only those dependency_settings are considered, which belong to parent
settings, which are not changeable on the current stage.
 2017-11-06 12:07:20 +01:00
Tobias Reischmann
8c067bb86d MDL-27886 backup: Enabled unlocking of backup settings 
The function is_locked was changed to determine only, if the
dependency_setting want's the dependent setting to be locked.
In the previous version, is_locked did not only check, if the
dependency_setting want's the setting to be locked, but also if the
setting was already locked. A recursive call to the status of the
dependent setting leaded to problems, when unlocking locked settings.

Also the PHPDOC of the is_locked was adjusted to coincide with the current
usage in backup_ui_settings->is_changeable() and
base_setting->set_status(). In both functions all dependency_settings of
a setting are iterated to check if this setting should be or is LOCKED_BY_HIERARCHY.
The actual state of the setting was therefore either checked beforehand
or is not interesting, since the question is, if it shall be changed.
 2017-11-06 12:07:20 +01:00
Tobias Reischmann
77a4d33755 MDL-27886 backup: Added behat tests for user data settings 
This new test defines different combinations of global and local user
data settings during the restore process and tests that global defaults
can be overriden.
 2017-11-06 12:07:20 +01:00
David Monllao
159b4e5d8c Moodle release 3.4rc1 v3.4.0-rc1 2017-11-03 10:26:18 +01:00
Jake Dallimore
aa95085969 Merge branch 'MDL-58047-master-fix1' of http://github.com/damyon/moodle 2017-11-03 16:09:29 +08:00
Damyon Wiese
79ea89fea2 MDL-58047 assign: submission sorting 
Only exclude new submission records from the sorting, draft and reopened submission are valid.
 2017-11-03 15:55:10 +08:00
Jun Pataleta
928bcb02d6 Merge branch 'MDL-60657-int-fix-1' of github.com:ryanwyllie/moodle 2017-11-03 16:51:24 +13:00
Ryan Wyllie
c2502375ff MDL-60657 boost: fix styles when extending modal components 
I've wrapped the custom modal styling in the .modal class. This prevents
those custom styles from being pulled in when the SCSS @extend
functionality is used to extend the modal components.
 2017-11-03 03:18:02 +00:00
Jake Dallimore
4071a2b6fe Merge branch 'MDL-60587-master-4' of git://github.com/andrewnicols/moodle 2017-11-03 09:14:52 +08:00
Andrew Nicols
6630b38c95 MDL-60587 calendar: Adjust use of time() in unit tests 2017-11-03 09:04:10 +08:00
Jake Dallimore
b974b5d05d Merge branch 'MDL-60587-master-4' of git://github.com/andrewnicols/moodle 2017-11-03 08:37:31 +08:00
Andrew Nicols
1ab858314a MDL-60587 block: Correct courseid/categoryid check 
pagelib uses magic getters for both the course, and category.
It does not define the magic __isset function though.
 2017-11-03 08:14:56 +08:00
David Monllao
bb2071ca17 Merge branch 'MDL-58047-34-sortbysubmission' of https://github.com/roperto/moodle 2017-11-02 16:57:03 +01:00
David Monllao
be713b7144 Merge branch 'MDL-51945-master' of git://github.com/jleyva/moodle 2017-11-02 16:54:34 +01:00
Andrew Nicols
e20752c4f5 MDL-60587 calendar: Fix un-validated params 2017-11-02 21:49:28 +08:00
Andrew Nicols
30ff29dc9f MDL-60587 calendar: Improve link params for calendar buttons 2017-11-02 21:49:28 +08:00
Andrew Nicols
6607c5ffb6 MDL-60587 calendar: Switch WS to use new helper 2017-11-02 21:49:28 +08:00
Andrew Nicols
7f14def230 MDL-60587 calendar: Add missing categoryid in upcoming WS 2017-11-02 21:49:28 +08:00
Andrew Nicols
39e364515f MDL-60587 calendar: Switch to new helper in main view 2017-11-02 21:49:28 +08:00
Andrew Nicols
557d8528eb MDL-60587 block_calendar_upcoming: Setup calendar using new helper 2017-11-02 21:49:28 +08:00
Andrew Nicols
0bd6039f40 MDL-60587 block_calendar_month: Setup calendar using new helper 2017-11-02 21:49:28 +08:00
Andrew Nicols
57e8c9f748 MDL-60587 calendar: Correct category subscription in information 2017-11-02 21:49:28 +08:00
Andrew Nicols
7b7bf31d4c MDL-60587 calendar: Add helper to setup the calendar_information 2017-11-02 21:49:28 +08:00
David Monllao
59aff5f949 Merge branch 'MDL-60634-master' of git://github.com/jleyva/moodle 2017-11-02 13:24:58 +01:00
Eloy Lafuente (stronk7)
f816ea9a67 Merge branch 'MDL-60659-master' of git://github.com/junpataleta/moodle 2017-11-02 12:45:22 +01:00
David Monllao
6e3314f044 Merge branch 'MDL-60633-master' of git://github.com/andrewnicols/moodle 2017-11-02 12:04:07 +01:00
David Monllao
2a542d0265 Merge branch 'MDL-60657-master' of git://github.com/ryanwyllie/moodle 2017-11-02 11:59:30 +01:00
Damyon Wiese
f18fb611c9 Merge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle 2017-11-02 15:46:42 +08:00
Andrew Nicols
43caf0217f MDL-60558 block_calendar_upcoming: Render the template when no events 2017-11-02 15:43:17 +08:00
David Monllao
7b03092121 Merge branch 'MDL-53501-master' of git://github.com/jleyva/moodle 2017-11-02 08:30:24 +01:00
Damyon Wiese
5dbd051502 Merge branch 'MDL-59950_master' of git://github.com/dmonllao/moodle 2017-11-02 14:39:32 +08:00
Jun Pataleta
c39a22f600 MDL-60659 mod_forum: Use PHP EOL for line breaks in expected values 2017-11-02 19:11:00 +13:00
Ryan Wyllie
f0f38bf1d3 MDL-60657 core: fix upgrade notice modal header padding 2017-11-02 06:07:00 +00:00
Damyon Wiese
41080050b0 Merge branch 'MDL-60558-master' of git://github.com/andrewnicols/moodle 2017-11-02 13:03:35 +08:00
Damyon Wiese
ae348e78a0 Merge branch 'MDL-59982_master' of git://github.com/markn86/moodle 2017-11-02 12:21:39 +08:00
Damyon Wiese
71fc06aae5 Merge branch 'MDL-60645-master' of git://github.com/andrewnicols/moodle 2017-11-02 12:10:04 +08:00
Andrew Nicols
e3491a093a MDL-60558 calendar: Upcoming block should use the right template 2017-11-02 11:55:49 +08:00
Andrew Nicols
a0a78199b8 MDL-60558 calendar: Add event metadata to upcoming template 2017-11-02 11:55:49 +08:00
Andrew Nicols
d523cbcb26 MDL-60558 calendar: Upcoming should support categories 2017-11-02 11:54:43 +08:00
Andrew Nicols
5c9acb8164 MDL-60558 calendar: Adjust URL change 
The URL change belongs in the calendar_view, not the view_manager.
The view_manager is responsibe for updating the view, not for the
resultant actions from it.

This also changes to use pushState so as not to overwrite the current
location in history.
 2017-11-02 11:54:13 +08:00
Andrew Nicols
8242027da3 MDL-60558 calendar: Move edit event to CRUD 2017-11-02 11:53:52 +08:00
Andrew Nicols
fd2f1ae146 MDL-60558 calendar: Remove old SELECTORS 2017-11-02 11:53:49 +08:00
Andrew Nicols
c8419f87c0 MDL-60558 calendar: Harden event link detection 2017-11-02 11:53:26 +08:00
Damyon Wiese
4837fea0aa Merge branch 'MDL-60619-master' of https://github.com/snake/moodle 2017-11-02 11:51:35 +08:00
Damyon Wiese
671440d708 Merge branch 'MDL-60576-master' of git://github.com/andrewnicols/moodle 2017-11-02 11:38:57 +08:00
Andrew Nicols
6c3f463dbd MDL-60558 calendar: Move the summary modal to view_manager 2017-11-02 10:56:00 +08:00
Damyon Wiese
fca7e60c81 Merge branch 'MDL-60655-master' of git://github.com/junpataleta/moodle 2017-11-02 10:45:07 +08:00
Jake Dallimore
1e83eec993 Merge branch 'MDL-60555-master' of https://github.com/sammarshallou/moodle 2017-11-02 10:40:43 +08:00
Jake Dallimore
216bb33940 Merge branch 'master_MDL-60007' of https://github.com/CengageEng/moodle 2017-11-02 08:50:42 +08:00
Andrew Nicols
58280ae0b8 Merge branch 'wip-MDL-60515-master' of git://github.com/abgreeve/moodle 2017-11-02 08:47:17 +08:00