mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 04:52:36 +02:00
Code Issues Projects Releases Wiki Activity
93,218 Commits 37 Branches 536 Tags
Commit Graph

93218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllaó
03876f0b89 Merge branch 'MDL-65207-master' of git://github.com/lameze/moodle 2019-04-24 17:52:10 +02:00
David Monllaó
45c8b226be Merge branch 'MDL-64782-master' of git://github.com/rezaies/moodle 2019-04-24 17:37:45 +02:00
Eloy Lafuente (stronk7)
439af892b1 Merge branch 'MDL-64151-master-fix' of https://github.com/marinaglancy/moodle 2019-04-24 12:21:38 +02:00
Marina Glancy
3340758b98 MDL-64151 forms: select element without selection 
Select element that is not multiple should export null when nothing is
selected. If the element is displayed there will always be something
selected.
 2019-04-24 11:34:13 +02:00
Jake Dallimore
5b0aa01fae Merge branch 'MDL-64267-master' of git://github.com/bmbrands/moodle 2019-04-24 16:54:55 +08:00
Jun Pataleta
b3c8984c0e Merge branch 'MDL-65032-master' of git://github.com/peterRd/moodle 2019-04-24 16:18:06 +08:00
Peter
565cccfafa MDL-65032 mod_forum: Update existing function to include lock params 2019-04-24 15:52:21 +08:00
Bas Brands
929706015b MDL-64267 core_message: sticky positioning of contact request info 2019-04-24 09:27:37 +02:00
Sara Arjona
c5625cfbc7 Merge branch 'MDL-65056-master' of git://github.com/abias/moodle 2019-04-24 09:18:25 +02:00
Tobias Reischmann
6d2b7d5028 MDL-64267 core_message: Removed pb-2 from message-container 
The padding at the bottom broke layout in clean theme since it caused an
overflow, which resulted in a second scrollbar on the message-drawer.
 2019-04-24 09:17:32 +02:00
Tobias Reischmann
28c007b2e7 MDL-64267 core_message: Moved contact-request to dont cause scrollbar 
The contact-request-sent-message-container was outside of the
conversation body and caused multiple overflows and thus multiple
scrollbars. Moving it inside does not have an effect on the layout
except one scrollbar is enough now.
 2019-04-24 09:16:29 +02:00
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
bdb4a87daa MDL-65032 mod_forum: Updates based on Jun's feedback 2019-04-24 12:49:41 +08:00
Peter
0547bed1a5 MDL-65032 mod_forum: Add locked column to the backup table. 2019-04-24 12:05:32 +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
c475fe410f MDL-65032 mod_forum: Pass the the entity factories into the vaults 2019-04-24 11:56:23 +08:00
Peter
f5b4320ec5 MDL-65032 mod_forum: Behat test for locking 2019-04-24 11:55:51 +08:00
Peter
2893812eb0 MDL-65032 mod_forum: Add discussion locking functionality 2019-04-24 11:55: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