mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-11 19:42:35 +02:00
Code Issues Projects Releases Wiki Activity
93,189 Commits 36 Branches 531 Tags
Commit Graph

93189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sara Arjona
bbbaeedfdc Merge branch 'MDL-65170-master' of https://github.com/snake/moodle 2019-04-24 09:02:20 +02:00
Jun Pataleta
e145874b8b Merge branch 'MDL-65069-master' of git://github.com/peterRd/moodle 2019-04-24 14:19:17 +08:00
Peter
cb28132dce MDL-65069 mod_forum: Remove unused code and additional dev docs. 
Additional updates to setting default subscription value for discussions
 2019-04-24 12:01:37 +08:00
Peter
2aff2c19a9 MDL-65069 mod_forum: Behat test for the inline form 2019-04-24 10:29:30 +08:00
Peter
0d71eee8b5 MDL-65069 mod_forum: Pass the class to style the button 2019-04-24 10:29:30 +08:00
Peter
e455d6f483 MDL-65069 core_form: Expose the form's submit's class attribute 
Exposed the submit button's class attribute so it can be overriden by
custom classes provided by the programmer.
 2019-04-24 10:29:30 +08:00
Peter
97babbf7d7 MDL-65069 mod_forum: Stripped out inpage form and advanced redirect 
* Stripped out the form for the inpage on the discussion list page.
* Tweaked the 'Advanced' redirect to take into account a nosubmit button
 which populates the subject, message and any files used within it.
 2019-04-24 10:29:30 +08:00
Peter
9ff7cae7c0 MDL-65069 mod_forum: inline 'add discussion' form 2019-04-24 10:29:30 +08:00
Adrian Greeve
082740b7c6 Merge branch 'MDL-65375-master' of https://github.com/sammarshallou/moodle 2019-04-24 10:28:29 +08:00
Adrian Greeve
4962446a44 Merge branch 'MDL-65308' of git://github.com/stronk7/moodle 2019-04-24 09:27:07 +08:00
Eloy Lafuente (stronk7)
fc8a72b4cb Merge branch 'MDL-65382-master' of git://github.com/junpataleta/moodle 2019-04-24 00:04:45 +02:00
Eloy Lafuente (stronk7)
f7b52799e6 MDL-65354 core: pretend that 'moodle/course:browse' never existed 
As far as the old capability only was added to master and we are
renaming it before release:

- don't need to deprecate the lang string.
- don't need to make any reference to it in the upgrade.txt info

So, basically, pretend it never existed.
 2019-04-23 23:55:35 +02:00
Eloy Lafuente (stronk7)
1470cfc2fd Merge branch 'MDL-65354-master' of git://github.com/lameze/moodle 2019-04-23 23:45:21 +02:00
Eloy Lafuente (stronk7)
ac753bdd29 Merge branch 'MDL-64676-master' of https://github.com/aanabit/moodle 2019-04-23 19:45:18 +02:00
Eloy Lafuente (stronk7)
1e36bcfb67 Merge branch 'MDL-64151-master' of git://github.com/marinaglancy/moodle 2019-04-23 19:26:47 +02:00
Eloy Lafuente (stronk7)
bc342f101a on-demand release 3.7dev+ 2019-04-23 17:36:46 +02:00
Eloy Lafuente (stronk7)
3339cbf26a MDL-64017 message_email: trailing whitespace fix 2019-04-23 14:06:00 +02:00
Eloy Lafuente (stronk7)
ea8a32f84c Merge branch 'MDL-65324-master-fix' of git://github.com/junpataleta/moodle 2019-04-23 14:00:44 +02:00
Jun Pataleta
3eed2af1d1 MDL-65324 mod_forum: Fix tests for timed discussion settings 2019-04-23 14:00:41 +02:00
Adrian Greeve
e15703efbd Merge branch 'MDL-64703-master-fix-1' of https://github.com/ryanwyllie/moodle 2019-04-23 14:00:37 +02:00
Ryan Wyllie
fcf393a100 MDL-64703 message: fix group conversation heading alignment 2019-04-23 14:00:33 +02:00
Adrian Greeve
0e483ba3a8 Merge branch 'MDL-64017_master-fix' of https://github.com/markn86/moodle 2019-04-23 14:00:30 +02:00
Eloy Lafuente (stronk7)
1f39068e03 Merge branch 'MDL-65248' of git://github.com/stronk7/moodle 2019-04-23 13:56:06 +02:00
Eloy Lafuente (stronk7)
9c0edd1212 MDL-65248 analytics: Replace upgrade script to apply for all moves 
While strictly we don't nedd to provide an upgrade path for master,
any dev/integration site already using some of the 3.7 new tagets
in models will break (class rename/move) if we don't perform the
update of all them.

This commit takes rid of the previous upgrade step, only performing
the update of a couple of targets and now supports all the (5) targets:

- course_dropout
- course_competencies
- course_completion
- course_gradetopass
- no_teaching
 2019-04-23 13:53:46 +02:00
Eloy Lafuente (stronk7)
3df9c60390 MDL-65248 core_user: Move some upcoming_activities_due strings 
From course lang files to user lang files (where the target belongs to)

AMOS BEGIN
    MOV [target:upcomingactivitiesdue,core_course],[target:upcomingactivitiesdue,core_user]
    MOV [target:upcomingactivitiesdue_help,core_course],[target:upcomingactivitiesdue_help,core_user]
AMOS END
 2019-04-23 13:53:42 +02:00
Jun Pataleta
0f39613771 Merge branch 'MDL-65311-xml-files' of https://github.com/brendanheywood/moodle 2019-04-23 13:53:39 +02:00
Jun Pataleta
72f7e3f198 Merge branch 'MDL-65324-master' of git://github.com/peterRd/moodle 2019-04-23 13:53:35 +02:00
Eloy Lafuente (stronk7)
5dec930fb0 Merge branch 'MDL-62459' of git://github.com/stronk7/moodle 2019-04-23 13:53:24 +02:00
Eloy Lafuente (stronk7)
0d575a542a Merge branch 'MDL-65248_master' of git://github.com/dmonllao/moodle 2019-04-23 13:50:22 +02:00
David Monllaó
080fb03d25 Merge branch 'MDL-64924' of git://github.com/Chocolate-lightning/moodle 2019-04-23 13:44:12 +02:00
David Monllaó
04f41dc247 Merge branch 'MDL-64102-master' of git://github.com/bmbrands/moodle 2019-04-23 13:44:08 +02:00
David Monllaó
2f3c8da164 Merge branch 'MDL-61199-master' of git://github.com/jleyva/moodle 2019-04-23 13:44:04 +02:00
Eloy Lafuente (stronk7)
735122c33f Merge branch 'MDL-64641-master' of git://github.com/jleyva/moodle 2019-04-23 13:43:56 +02:00
David Monllaó
906800a082 Merge branch 'MDL-65102-master' of git://github.com/rezaies/moodle 2019-04-23 13:42:37 +02:00
David Monllaó
6dbe565998 Merge branch 'MDL-65211-master' of git://github.com/jleyva/moodle 2019-04-23 13:42:33 +02:00
David Monllaó
1986293d78 Merge branch 'MDL-65251-master' of git://github.com/junpataleta/moodle 2019-04-23 13:42:30 +02:00
Eloy Lafuente (stronk7)
b780451d9f Merge branch 'MDL-65254-master' of git://github.com/cescobedo/moodle 2019-04-23 13:42:08 +02:00
David Monllaó
f729aea695 Merge branch 'MDL-65255-master' of git://github.com/jleyva/moodle 2019-04-23 13:36:57 +02:00
David Monllaó
296a85db86 Merge branch 'MDL-65184' of git://github.com/Chocolate-lightning/moodle 2019-04-23 13:36:53 +02:00
David Monllaó
8de5c25696 Merge branch 'MDL-64701-category-customfields-master' of https://github.com/dmitriim/moodle 2019-04-23 13:36:50 +02:00
Mark Nelson
c01533646d MDL-64017 message_email: fixed incorrect unread count 2019-04-23 12:15:35 +08:00
David Monllaó
3d15deff15 Merge branch 'MDL-65222' of git://github.com/timhunt/moodle 2019-04-22 09:08:37 +02:00
Eloy Lafuente (stronk7)
594717128d MDL-62459 database: remove unused table role_sortorder 2019-04-22 01:37:14 +02:00
Eloy Lafuente (stronk7)
65c6deca6f Merge branch 'MDL-65378_master' of git://github.com/dmonllao/moodle 2019-04-22 01:03:34 +02:00
Eloy Lafuente (stronk7)
1d75eb9bad Merge branch 'MDL-65275_master' of git://github.com/markn86/moodle 2019-04-22 00:58:37 +02:00
sam marshall
7e604b418e MDL-65375 Restore: Log restore must support new jsonformat setting 
Includes support for the new jsonformat setting in logstore_standard
and logstore_database.

Also includes a bugfix where the restore used to restore NULL into
'other' fields, which were not null otherwise, so it was inconsistent
with normal logging.
 2019-04-18 16:07:01 +01:00
Adrian Greeve
8c67db30a6 Merge branch 'MDL-64017_master' of git://github.com/markn86/moodle 2019-04-18 16:18:22 +08:00
Mark Nelson
168d782ff8 MDL-64017 message_email: task to send messages as a digest 2019-04-18 16:03:27 +08:00
Jun Pataleta
a0653e5c4a MDL-65382 tool_dataprivacy: Fix appearance of status labels 2019-04-18 15:29:07 +08:00
Jun Pataleta
83d4204ef1 MDL-65382 mod_lti: Fix appearance of status labels 2019-04-18 15:28:48 +08:00