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
92,890 Commits 37 Branches 536 Tags
Commit Graph

7707 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
40df718398 Merge branch 'MDL-65094-master' of git://github.com/rezaies/moodle 2019-04-04 22:32:52 +02:00
Sara Arjona
86c3df962f Merge branch 'MDL-64506' of git://github.com/Chocolate-lightning/moodle 2019-04-03 19:30:28 +02:00
Mathew May
5db1ce5331 MDL-64506 templates: BS2 pull-x -> BS4 float-x 2019-04-03 19:47:13 +08:00
Mathew May
5edb0fbcb5 MDL-64506 templates: replace spans where and col-x appears 2019-04-03 19:47:13 +08:00
Mathew May
5cac5fa428 MDL-64506 templates: BS2 m-x-x to BS4 mx-x 2019-04-03 19:47:11 +08:00
Mathew May
b293214a7e MDL-64506 behat: Modify usertours behat. 
Original test relied on a 3rd theme to test against.
With only two themes in core now we need to make the test
theme/ suite specific.
 2019-04-03 19:34:20 +08:00
Mathew May
3f2c68f119 MDL-64506 templates: Move BS2 labels to BS4 badges 2019-04-03 19:34:20 +08:00
Mathew May
29551c4b1a MDL-64506 templates: Move BS2 btns' to BS4 btns' 
well bs2 class is now card in bs4
 2019-04-03 19:34:20 +08:00
Mathew May
6ecc445939 MDL-64506 templates: Remove BS2 spans from elements. 2019-04-03 19:34:20 +08:00
Mathew May
e00f1c663c MDL-64506 phpunit: Update unit tests to use classic 2019-04-03 19:34:20 +08:00
Mathew May
c8edee421e MDL-64506 theme_bootstrapbase: Remove bootstrapbase from core 2019-04-03 19:34:17 +08:00
Jun Pataleta
1b011cdbda Merge branch 'MDL-65204-master' of git://github.com/junpataleta/moodle 2019-04-03 10:57:12 +08:00
Eloy Lafuente (stronk7)
85f47bae7f MDL-65204 phpunit: various fixes to assertions 
Namely:
   - 3rd param of assertEquals() cannot be null.
   - Some incorrect uses of assertNotEmpty().
   - Comparing 2 strings now uses strict (===) evaluation.
       Link: https://github.com/sebastianbergmann/phpunit/issues/3185
     Solution here is one of:
       a) Return to the previous situation, making the comparison
          softer. That can achieved by forcing different types, so
          float == string works.
       b) Changing APIs (both forms and database return strings) to
          perform some conversion to floats. That would make float
          comparison (with floats or strings) to work too.
     The patch here follows the a) approach. Changing all the internals
     for proper float handling sounds excesive when it has been working
     perfectly since ever. So we went the easier route, just getting
     rid of the new === comparisons when needed by changing expectation
     types to float.
 2019-04-03 10:39:19 +08:00
Jake Dallimore
849d2e5dad Merge branch 'MDL-63569-email-header-master' of https://github.com/pauldamiani/moodle 2019-04-03 09:43:51 +08:00
Eloy Lafuente (stronk7)
481c1ae4ce Merge branch 'MDL-64779_master' of git://github.com/dmonllao/moodle 2019-04-02 23:23:13 +02:00
Adrian Greeve
a5b79e4b85 Merge branch 'MDL-65138-master' of git://github.com/lameze/moodle 2019-04-02 10:37:34 +08:00
Paul Damiani
9ffbb78668 MDL-63569 email: New setting to prefix the subject of outgoing emails 2019-04-02 11:02:03 +11:00
David Monllaó
75dfc588b5 MDL-64779 tool_analytics: Export selector 2019-04-01 13:56:37 +02:00
Simey Lameze
73fabadadd MDL-65138 course: add a setting for course publishing 2019-04-01 15:39:07 +08:00
Jun Pataleta
595fa0c5d3 MDL-63876 tool_lp: Fix illegal whitespace 2019-03-29 12:13:48 +08:00
Damyon Wiese
6bdaf20462 MDL-63876 competencies: Skip enabled check 
Allow rendering a competency summary if competencies are disabled, but do not include
links to competencies pages.
 2019-03-29 11:31:15 +08:00
Damyon Wiese
8aff6f6f14 MDL-63876 badges: Coding style 
Add comments to document function params and template example context.
 2019-03-29 11:31:15 +08:00
Damyon Wiese
15e6a76e6f MDL-63876 competencies: Use direct URL 
Instead of showing competencies in a dialogue, give them their own full url to
display the competency in the framework it belongs to. This is useful for exported
data that won't have access to javascript.
 2019-03-29 11:31:15 +08:00
Damyon Wiese
da5e19a128 MDL-63876 badges: Do not call tool_lp directly 2019-03-29 11:31:15 +08:00
Damyon Wiese
f94786e0e1 MDL-63876 badges: Add competency criteria 
Properly integration badges with competencies provided in Moodle.

Automatically grant the badge when the defined competencies are marked as proficient.
 2019-03-29 11:31:15 +08:00
Sara Arjona
ca06f046af Merge branch 'MDL-64642-master' of https://github.com/albertgasset/moodle 2019-03-26 19:36:21 +01:00
Albert Gasset
f19beb3279 MDL-64642 tool_mobile: Web service tool_mobile_call_external_functions 2019-03-26 16:26:06 +01:00
Juan Leyva
c6ebb024f2 MDL-64337 tool_mobile: Add app promotion text in email notifications 2019-03-26 14:51:21 +01:00
Shamim Rezaie
0b23fad474 MDL-65094 registration: don't encourage registration if on localhost 2019-03-26 16:54:19 +11:00
Sara Arjona
7896fdf106 Merge branch 'MDL-64615-master' of git://github.com/jleyva/moodle 2019-03-25 18:20:01 +01:00
Eloy Lafuente (stronk7)
a99ef60c6b MDL-63263 tool_recyclebin: show the note as part of the heading element 
It looks better (IMO) than using admin_setting_description and works in all
branches.
 2019-03-21 00:13:27 +01:00
Eloy Lafuente (stronk7)
5810888077 Merge branch 'MDL-63263-Master' of https://github.com/tuanngocnguyen/moodle 2019-03-20 23:14:32 +01:00
Adrian Greeve
b1869131cf Merge branch 'MDL-60936_master' of git://github.com/dmonllao/moodle 2019-03-20 14:50:46 +08:00
Adrian Greeve
9433fd4424 Merge branch 'MDL-65005-master-fix' of git://github.com/junpataleta/moodle 2019-03-20 13:55:45 +08:00
Jun Pataleta
f50778c822 MDL-65005 tool_policy: Ensure the user's on the Dashboard after agreeing 2019-03-20 12:58:16 +08:00
Adrian Greeve
e081d6000e Merge branch 'MDL-64505-master-final' of git://github.com/mickhawkins/moodle 2019-03-20 09:26:39 +08:00
Eloy Lafuente (stronk7)
a1c99c02cf Merge branch 'MDL-64990_master' of git://github.com/markn86/moodle 2019-03-19 23:03:56 +01:00
Eloy Lafuente (stronk7)
cd8e0cf210 Merge branch 'MDL-64979-master' of https://github.com/sammarshallou/moodle 2019-03-19 22:01:27 +01:00
sam marshall
05a5d547b3 MDL-64979 Behat: Add option to increase timeouts 2019-03-19 17:17:55 +00:00
Eloy Lafuente (stronk7)
6eca6f3e54 Merge branch 'MDL-65006-master' of git://github.com/sarjona/moodle 2019-03-18 23:35:17 +01:00
Eloy Lafuente (stronk7)
e0757dd508 Merge branch 'MDL-63074-master' of git://github.com/bmbrands/moodle 2019-03-18 20:15:48 +01:00
Michael Hawkins
140de372fd MDL-64505 behat: Updated searching admin to work consistently 
The way behat_admin::i_set_the_following_administration_settings_values
was searching would fail inconsistently, due to the timing of the steps
not always working correctly.
 2019-03-18 18:59:23 +08:00
David Monllaó
3576b66bfd MDL-60936 analytics: Timesplittings setting only for evaluation 2019-03-18 09:34:52 +01:00
Nathan Nguyen
cebfb23fb1 MDL-63263 tool_recyclebin: Apply automated backup setting 
Use Automated backup settings as settings for Recycle bin backup and restore.
 2019-03-15 14:56:34 +11:00
Rex Lorenzo
9665abad31 MDL-63263 tool_recyclebin: Recycle bin should always save user data. 2019-03-15 14:56:34 +11:00
Eloy Lafuente (stronk7)
22b02995f4 Merge branch 'MDL-46931' of https://github.com/paulholden/moodle 2019-03-14 01:26:39 +01:00
Eloy Lafuente (stronk7)
539b5a59f3 Merge branch 'MDL-63366-master' of git://github.com/andrewnicols/moodle 2019-03-14 00:31:39 +01:00
Juan Leyva
c9a952776e MDL-64615 tool_mobile: Do not modify custom download URLs 2019-03-13 17:10:02 +01:00
Jake Dallimore
a3d85254f1 Merge branch 'MDL-64495-master' of https://github.com/aanabit/moodle 2019-03-13 16:36:04 +08:00
Amaia Anabitarte
a029ee00cd MDL-64495 admin: New Messaging settings category in Site administration 2019-03-12 10:40:43 +01:00