moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84018 commits 37 branches 540 tags 1.3 GiB
Commit graph

84018 commits

This branch
This branch
All branches
Author SHA1 Message Date
Juan Leyva
495745a36e MDL-57821 mod_feedback: Allow export tables to external structure 2017-04-04 12:01:22 +02:00
Cameron Ball
59a601e632 MDL-58087 core_calendar: Set correct ID for repeat event collection 
Initially we were only sending "top level" events through our API
i.e., events that can be repeated, but are not repeats themselves.
In the future we will be sending ALL events through our API and int
that situation the ID of the collection needs a small bit of logic
to correctly set the ID of the parent.

Part of MDL-55611 epic.
 2017-04-04 11:01:19 +01:00
Marina Glancy
125c4c4cb8 MDL-57961 course: change wording of module availability 
renamed Visible to Availability and added help strings

AMOS BEGIN
 CPY [availability,core_moodle],[modvisible,core_moodle]
 CPY [availability,core_moodle],[modvisiblewithstealth,core_moodle]
 CPY [availability,core_moodle],[modvisiblehiddensection,core_moodle]
 CPY [show,core_moodle],[modshow,core_moodle]
 CPY [hide,core_moodle],[modhide,core_moodle]
AMOS END
 2017-04-04 17:05:57 +08:00
Dan Poltawski
5eff54929d Merge branch 'MDL-12689-master-fix1' of http://github.com/damyon/moodle 2017-04-04 07:51:05 +01:00
Damyon Wiese
46d5582ec9 MDL-58478 oauth2: Use real admin settings 
This is an upgrade to real admin settings to comply with MDL-12689
 2017-04-04 14:37:13 +08:00
Daniel Thee Roperto
745212bda0 MDL-58479 documentation: fixed phpdoc for notice(). 2017-04-04 16:20:41 +10:00
Dan Poltawski
ab8aa88214 Merge branch 'MDL-55941-initialbar-ux' of https://github.com/ilya-catalyst/moodle 2017-04-04 06:56:26 +01:00
Dan Poltawski
dda4dcaffb Merge branch 'MDL-58220-master-fix1' of http://github.com/damyon/moodle 2017-04-04 06:54:07 +01:00
Andrew Nicols
930cab683d Merge branch 'master' of https://github.com/koennys/moodle 2017-04-04 11:48:50 +08:00
Damyon Wiese
d37945c37a MDL-58220 repository_onedrive: standard plugin 
Add this plugin to the standard plugin list.
 2017-04-04 11:18:27 +08:00
Damyon Wiese
3615842625 MDL-12689 auth: No settings if ldap missing 2017-04-04 11:15:29 +08:00
Andrew Nicols
a9bca28400 Merge branch 'wip-MDL-41809-master' of git://github.com/marinaglancy/moodle 2017-04-04 10:43:41 +08:00
Andrew Nicols
7d1709f91e MDL-48771 mod_quiz: Rebase conflict fix img => .icon 2017-04-04 10:41:22 +08:00
Damyon Wiese
6e53e3d232 MDL-58220 repo: Fix typo in FILE_CONTRLLED_LINK 2017-04-04 10:40:01 +08:00
Andrew Nicols
23f1f5211e Merge branch 'MDL-48771-squashed' of git://github.com/timhunt/moodle 2017-04-04 10:37:26 +08:00
Damyon Wiese
bcd08003fa MDL-58220 lang: Add / fix lang strings 
The refactoring during integration caused some lang string errors.
 2017-04-04 10:28:14 +08:00
Colin Chambers
f37cffb6a5 MDL-48771 quiz edit: delete mulitiple tidy up & Behat tests 2017-04-04 01:53:43 +01:00
David Monllao
6d353d2dfd MDL-23919 mod_data: completionentries can be null 2017-04-04 00:27:30 +02:00
David Monllao
b1e8f8bf37 MDL-12689 mod_data: Remove trailing whitespaces 2017-04-04 00:14:35 +02:00
David Monllao
fcada374ac Merge branch 'MDL-12689_m33v4' of https://github.com/sbourget/moodle 2017-04-04 00:08:50 +02:00
David Monllao
bf3b4321c0 MDL-23919 mod_data: Clean illegal whitespace 
Also moving upgrade step below 3.2 mark.
 2017-04-04 00:07:24 +02:00
Mohamed Afrar
49b60a1c9a MDL-57475 Forum: Fixing issue with the 'preferences' link in emails 2017-04-04 03:00:55 +05:30
David Monllao
ea51aa631b Merge branch 'MDL-23919-mod_data-required-entry-completion' of https://github.com/marcusgreen/moodle 2017-04-03 23:24:28 +02:00
Luca Bösch
5d803e5395 MDL-48771 quiz: Select multiple questions to delete 
Upon Moodle 2.8 the option to bulk delete all questions of a quiz
disappeared.
This patch adresses this and reintruduces a bulk action button.
Pushing that button shows a Delete and a Cancel button as well as
two Select all / Deselect all triggers and each and every question
gets a checkbox. The UI is slimmed down and other elements (e.g.
'Repaginate' button and so on) are hidden. Questions can be chosen
and deleted by pushing the Delete button. The bulk action button
is disabled when quiz attempts are present, just like the
'Repaginate' button.

TODO: Behat tests are lacking.
 2017-04-03 20:11:47 +01:00
Marina Glancy
cf873ada46 MDL-23919 mod_data: small corrections to completion form element 2017-04-03 18:15:52 +01:00
Dan Poltawski
a29cd3138c Merge branch 'MDL-57411-master' of git://github.com/jleyva/moodle 2017-04-03 17:59:34 +01:00
AMOS bot
510a16b23f Automatically generated installer lang files 2017-04-04 00:05:15 +08:00
Stephen Bourget
037273d87e MDL-12689: convert auth plugins to use settings.php 2017-04-03 10:50:09 -04:00
Eloy Lafuente (stronk7)
8478e5b44c Merge branch 'MDL-58462-master' of git://github.com/junpataleta/moodle 2017-04-03 16:35:50 +02:00
David Monllao
371e2385a9 Merge branch 'MDL-55459-master' of https://github.com/lucisgit/moodle 2017-04-03 16:27:26 +02:00
Dan Poltawski
ece14dab98 MDL-37765 install: Fix missinf field definition 2017-04-03 13:45:59 +01:00
Dan Poltawski
49c2964b71 MDL-37765 block_login: fix whitespace 2017-04-03 12:55:07 +01:00
Dan Poltawski
3ca68f24f7 Merge branch 'MDL-58220-master' of git://github.com/damyon/moodle 2017-04-03 12:41:56 +01:00
Dan Poltawski
1e3aa70ff0 MDL-37765 version: bump 2017-04-03 09:14:46 +01:00
Dan Poltawski
02eaa42f23 Merge branch 'MDL-37765-MASTER' of https://github.com/jacac/moodle 2017-04-03 09:13:55 +01:00
Andrew Nicols
6fdf167b0f Merge branch 'MDL-50970-master' of git://github.com/jleyva/moodle 2017-04-03 15:38:53 +08:00
Juan Leyva
8446ba3641 MDL-50970 core_block: New Web Service core_block_get_course_blocks 2017-04-03 09:27:53 +02:00
Jun Pataleta
cefd780fa3 MDL-58462 mod_data: Generate users with different names 
* Give test users different first and last names.
* Declare class member variables instead of dynamically assigning them.
* Rename member variable $data to $database since it conflicts with the
  private member variable PHPUnit_Framework_TestCase::$data.
* Replace setExpectedException usage with expectException().
 2017-04-03 13:49:25 +08:00
Damyon Wiese
aa89bf2e6c MDL-58220 repo: Dont expect file info for any file 
Some plugins do not implement the file info callback so expect and handle null in this case.
 2017-04-03 13:43:27 +08:00
Damyon Wiese
1d43165a5a MDL-58220 oauth2: Provide template specific help links 
E.g. separate pages for Microsoft / Google.
 2017-04-03 13:43:27 +08:00
Damyon Wiese
14cfd280d3 MDL-58220 oauth2: Sanity check user pictures 2017-04-03 13:43:27 +08:00
Damyon Wiese
7b9f5b9986 MDL-58220 oauth2: Cleanup on user delete 
Delete the linked logins for this user account when it is deleted.
 2017-04-03 13:43:27 +08:00
Damyon Wiese
512e681a3b MDL-58220 oauth2: Don't login as deleted users 
Also prevent sesskey error on first page of new logins.
 2017-04-03 13:43:27 +08:00
Damyon Wiese
7f15866006 MDL-58220 oauth2: Use email as default username 
And give better error messages.
 2017-04-03 13:43:27 +08:00
Damyon Wiese
e7688f559a MDL-58220 onedrive: Add import from skydrive 
If the skydrive repo exists - show a button on the config page for the onedrive repo to "steal" all the files
from the other repo and disable it.
 2017-04-03 13:43:27 +08:00
Damyon Wiese
86a5f1efe1 MDL-58220 repository_skydrive: Add deprecation warning 2017-04-03 13:43:27 +08:00
Damyon Wiese
e518ea7949 MDL-58220 repository_onedrive: rename from skydrive 
Update all references from skydrive to onedrive in the code / lang strings.
 2017-04-03 13:43:27 +08:00
Damyon Wiese
9b8a36e882 MDL-58220 repository_skydrive: put back existing 
Restore the existing skydrive repo from integration / master.

Because we cannot upgrade cleanly - it's better not to touch the existing repo.
 2017-04-03 13:43:27 +08:00
Damyon Wiese
0931acf96b MDL-58220 repository: Move skydrive -> onedrive 2017-04-03 13:43:27 +08:00
Damyon Wiese
33536fb2b7 MDL-58220 repositories: missing/disabled issuer 
This makes the code checking for a missing / disabled issuer a bit cleaner.
 2017-04-03 13:43:26 +08:00