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
84,243 Commits 36 Branches 519 Tags
Commit Graph

2598 Commits

Author SHA1 Message Date
Andrew Nicols
442908a100 Merge branch 'MDL-58138-master-v2' of git://github.com/snake/moodle 2017-04-19 11:53:40 +08:00
Jake Dallimore
273d310601 MDL-58138 completion: Fixes for a number of small issues. 2017-04-19 11:41:57 +08:00
Marina Glancy
7f53e8aa22 MDL-58267 completion: allow to set default activity completion 
Part of MDL-58138 epic
 2017-04-19 08:54:35 +08:00
Dan Poltawski
bdc70bbffd MDL-58625 competency restore: avoid use of magic gettter 
These were deprecated when persistents moved to core.
 2017-04-18 10:43:05 +01:00
Jake Dallimore
84fb93a77e Merge branch 'MDL-58297-master' of git://github.com/andrewnicols/moodle 2017-04-11 10:49:07 +08:00
Andrew Nicols
e6a4780452 MDL-58297 core: Update to use new hashing functions 2017-04-07 10:40:23 +08:00
Eloy Lafuente (stronk7)
aa2b5b214d Merge branch 'wip-MDL-57769-master' of https://github.com/marinaglancy/moodle 2017-04-05 01:31:08 +02:00
Dan Poltawski
1e4e5c52d7 Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle 2017-04-04 17:07:41 +01:00
Damyon Wiese
6e53e3d232 MDL-58220 repo: Fix typo in FILE_CONTRLLED_LINK 2017-04-04 10:40:01 +08:00
Damyon Wiese
151b0f9409 MDL-58132 repositories: Controlled link file type 
This introduces a new "controlled link" file type where the file is not
stored in Moodle - but Moodle will control the access permissions on the file.

Plugins can "freeze" a filearea which means Moodle will take ownership of all the remote
files of this type.

When accessing a file, if the "filebrowser" infomation indicates the current user can write to the file, they
will be granted temporary write access.

Part of MDL-58220
 2017-04-03 13:40:13 +08:00
Simey Lameze
fdeeaff954 MDL-58265 core_test: replace I turn editing on steps 
Also remove few more unnecessary steps that redirects behat to
site home page to actually get to the course.

Part of MDL-55611 epic.
 2017-04-03 11:37:07 +08:00
Simey Lameze
93be3f730c MDL-58265 core_test: remove unnecessary steps 
This commmit removes steps that take behat to site home page
to actually get to a course page.

Part of MDL-55611 epic.
 2017-04-03 11:37:07 +08:00
Simey Lameze
c987d1b2ef MDL-58265 core_test: replace all uses of I follow course steps 
Part of MDL-55611 epic.
 2017-04-03 11:37:07 +08:00
Marina Glancy
1091687ac2 MDL-57769 backup: support removed 'numsections' in backup/restore 2017-03-30 08:26:17 +08:00
Marina Glancy
af0698c007 MDL-57769 format_topics: remove numsections option 2017-03-30 08:26:17 +08:00
Dan Poltawski
48f5c05019 Merge branch 'wip-MDL-34859-master' of git://github.com/marinaglancy/moodle 2017-03-20 07:54:22 +00:00
Marina Glancy
44e86fb3d5 MDL-34859 backup: add restore defaults 2017-03-20 14:59:45 +08:00
Damyon Wiese
3e6adcd69c MDL-40759 icons: Rename activity_icon 
image_icon is a better name because there are some valid uses for these other than for activity icons.

E.g. Old JS code that is not worth re-writing.
 2017-03-17 15:52:18 +08:00
Damyon Wiese
8857c715d1 MDL-40759 icons: Behat fixes for font-awesome 2017-03-17 15:52:18 +08:00
Damyon Wiese
c2dde7eebc MDL-40759 icons: Split pix_icon from activity_icon 
Activity icons always use the standard icon renderer.
 2017-03-17 15:51:29 +08:00
Marina Glancy
92253b15b7 MDL-40838 backup: restore enrolment methods without users 2017-02-20 12:08:35 +08:00
Eloy Lafuente (stronk7)
bad6e880b2 Merge branch 'MDL-53991_m33v4' of https://github.com/sbourget/moodle 2017-02-14 18:12:39 +01:00
Marina Glancy
8341055eb4 MDL-4782 course: Allow activities in the "stealth" mode 
Add field 'visibleoncoursepage' to the course_modules table
Add site-wide setting for turning on stealth mode availability
Add callback for "stealth" mode support in the course formats
Change display of modules/sections availability on the course page
 2017-02-14 16:38:05 +08:00
B Krishnan Iyer
5c3e1eedb7 MDL-57354 output: Render continue button as a primary button. 2017-02-13 15:50:52 +00:00
Stephen Bourget
f8dad7374c MDL-53991 calendar: fix repeating events on course import 2017-01-12 09:06:47 -05:00
Rajesh Taneja
2700a9aff1
MDL-57325 behat: Fixed backup/restore steps to use proper api 2016-12-09 09:30:18 +08:00
Andrew Nicols
5b67c9ecd1 Merge branch 'wip-MDL-56614-master-2' of https://github.com/marinaglancy/moodle 2016-12-06 13:37:33 +08:00
Marina Glancy
e5287f9b3b MDL-56614 behat: navigate without navigation and admin blocks 2016-12-06 11:49:14 +08:00
Eloy Lafuente (stronk7)
73ddcea6e9 MDL-57265 backup: Bump release to 3.3 2016-12-05 01:30:17 +01:00
Dan Poltawski
5814817ceb Merge branch 'MDL-57169_master' of git://github.com/markn86/moodle 2016-11-30 11:04:38 +00:00
Eloy Lafuente (stronk7)
04649747a4 MDL-57197 versions: bump all versions and requires near release 
version = 2016120500 release version
requires= 2016112900 current rc4 version
 2016-11-29 22:57:05 +01:00
David Herney
5634310997 MDL-57169 backup: ensure images in category descriptions are shown 2016-11-29 11:40:47 +08:00
Marina Glancy
392367c4f7 MDL-56586 behat: fix behat tests to work with new add block 2016-11-25 14:04:10 +08:00
Frederic Massart
3d3fb328b4
MDL-57063 backup: Do not try to set default value on locked setting 
We cannot set a default value on settings which are 'config' or
'permission' locked or an exception will be thrown from
base_setting::set_value.
 2016-11-21 11:03:41 +08:00
David Monllao
f48cc821db Merge branch 'MDL-56972-master' of https://github.com/snake/moodle 2016-11-21 09:05:40 +08:00
Jake Dallimore
fe9864f488 MDL-56972 backup: fix question category stamp duplicates during restore 
To kerb future stamp duplication, MDL-54864 added a unique index to the
question_categories table (stamp, contextid) and added an upgrade step
to fix existing duplicate stamps. It missed the case where a course with
duplicate stamps in the same context is directly restored into moodle
3.1, causing index clashes. This issue provides a fix for that.
 2016-11-18 11:15:02 +08:00
Rajesh Taneja
4ea8f814a0
MDL-56981 behat: Fixed xpath of radio button to contain class 2016-11-16 08:14:07 +08:00
Damyon Wiese
813afc6797 MDL-56618 behat: Fix xpath for behat 
We changed the output so the test needs to match
 2016-11-15 09:07:39 +00:00
Damyon Wiese
fe3db0ca08 MDL-56618 theme_boost: Fix backup / restore pages (again) 
I removed most of the layout styles and started again.
 2016-11-14 15:00:46 +08:00
Jake Dallimore
ff4230d88e MDL-54751 behat: Support for adhoc module and section deletion in behat 
Introduced new behat step for running all pending adhoc tasks and
modified the relavant behat tests.
 2016-11-07 07:41:59 +08:00
Jake Dallimore
3869d77411 MDL-54751 core_course: Edit course libs to support deletion flag 
Changed the course libs such that module and section deletion is now
handed off to relevant functions in the util class and exempted
modules scheduled for deletion from the course backups.
 2016-11-07 07:41:59 +08:00
Eric Merrill
880fc15bf0 MDL-47162 core_message: Updating all uses of messaging to add courseid 2016-10-31 14:13:13 -04:00
Amanda Doughty
cc350fd9c8 MDL-47162 core_message: Add course id to message eventdata 2016-10-27 18:11:27 +02:00
Dan Poltawski
a360594259 Merge branch 'MDL-56136' of git://github.com/timhunt/moodle 2016-10-25 20:44:42 +01:00
Dan Poltawski
7af5ad97c1 MDL-46942 events: fix naming of other param 
originalcourseid matches coding style
 2016-10-25 20:18:35 +01:00
Dan Poltawski
7e670910ed Merge branch 'MDL-46942-added-original-course' of https://github.com/jmalmsten-panopto/moodle 2016-10-25 20:15:55 +01:00
jmalmsten-panopto
3480411e0d MDL-46942 core_backup: added original course id to restore event 2016-10-24 09:01:34 -07:00
Frédéric Massart
17553c6350 MDL-56213 theme_boost: Visual inconsistencies in backup/restore 
* Some additional SCSS rules were added to be more visually pleasing
* Javascript had to be tweaked as targets were too specific
 2016-10-24 10:29:38 +01:00
Damyon Wiese
ba5c5083c5 MDL-55074 theme_boost: Behat fixes for latest theme changes 
Fix I edit profile steps
Apply fixed header in css
Remove transitions from menus for behat
Be more specific about some "I follow" steps
Navigation path changes
"Current course" node removed from nav tree
Adapt tests because there are no default blocks
Force some space between action menu items
 2016-10-21 16:06:54 +08:00
Michael Aherne
4582da2464 MDL-56319 blocks: Observe empty default blocks setting 2016-10-07 09:59:09 +01:00