mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 13:10:08 +01:00
Code Issues Projects Releases Wiki Activity
93,170 Commits 36 Branches 523 Tags
Commit Graph

93170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
da5a90a822 Merge branch 'MDL-64137-master' of git://github.com/bmbrands/moodle 2019-04-18 14:55:20 +08:00
Bas Brands
2902ca9d92 MDL-64017 message_email: Added mustache templates for email 2019-04-18 14:28:09 +08:00
Mark Nelson
d5d4a5aab2 MDL-64017 core_message: can specify conversation to view on index page 2019-04-18 14:28:09 +08:00
Mark Nelson
9b6034bc77 MDL-64017 message_email: populate new DB table when required 2019-04-18 14:28:09 +08:00
Mark Nelson
c210455a4c MDL-64017 core: remove group conversation check for processors 
We now want to allow processors to process group messages.
 2019-04-18 14:28:09 +08:00
Mark Nelson
ca754fc8c2 MDL-64017 core_message: pass conversation type to processors 2019-04-18 14:28:09 +08:00
Mark Nelson
9bc1b8f8da MDL-64017 message_email: updated privacy provider 2019-04-18 14:28:09 +08:00
Mark Nelson
97c85a001c MDL-64017 message_email: add new database table 
This table will be responsible for storing the messages
that need to be emailed, but have not yet. A task will
run that will email these and then remove them from the
table.
 2019-04-18 14:28:09 +08:00
Adrian Greeve
48fa567da2 Merge branch 'MDL-29318-master' of git://github.com/junpataleta/moodle 2019-04-18 13:48:33 +08:00
Adrian Greeve
eae20bc94a MDL-64715 core_message: Fix for message upgrade db prefix. 2019-04-18 11:47:13 +08:00
Jun Pataleta
9f23a65e0c Merge branch 'MDL-64956-master2' of git://github.com/peterRd/moodle 2019-04-18 11:09:49 +08:00
Adrian Greeve
862a9b1d60 Merge branch 'MDL-64715-master-self-starred-pr-ryan' of git://github.com/sarjona/moodle 2019-04-18 11:06:57 +08:00
Adrian Greeve
e16ab06b46 Merge branch 'MDL-64703-master' of git://github.com/bmbrands/moodle 2019-04-18 09:12:43 +08:00
Simey Lameze
3bc573501a MDL-65354 core: replace all usages of old cap 2019-04-18 08:57:52 +08:00
Simey Lameze
d26749b74c MDL-65354 core: rename course:browse cap to category:browsecourses 2019-04-18 08:57:48 +08:00