mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-09 02:12:22 +02:00
Code Issues Projects Releases Wiki Activity
81,723 Commits 36 Branches 530 Tags
Commit Graph

81723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Okely
eea9f10900 MDL-56715 form: Allow password unmask fields to be cleared in FF49 2016-11-10 11:22:59 +08:00
Simey Lameze
763f7b05ae MDL-56753 mod_assign: behat tests for groups and grouping counting 2016-11-10 11:09:37 +08:00
Andrew Nicols
96eba6b982 Merge branch 'MDL-55883_m32v1' of https://github.com/sbourget/moodle 2016-11-10 11:06:11 +08:00
Tomasz Muras
ff1fc4d9f4 MDL-54646 tags: Hide manage tags in menu if tags disabled. 2016-11-10 10:59:06 +08:00
Simey Lameze
426bb5ae0f MDL-56753 mod_assign: fix groups and submitted counting on grading summary 
This also fixes a coding error that was displayed when a group was not part of
assignment grouping.
 2016-11-10 10:58:29 +08:00
Andrew Nicols
b8af6c1ef0 Merge branch 'MDL-56585-master' of git://github.com/danpoltawski/moodle 2016-11-10 09:53:28 +08:00
Andrew Nicols
743f9c8c42 Merge branch 'wip-mdl-56840' of https://github.com/rajeshtaneja/moodle 2016-11-10 09:38:26 +08:00
Andrew Nicols
a6f85967e0 Merge branch 'MDL-56754-master' of git://github.com/jleyva/moodle 2016-11-10 08:29:04 +08:00
Andrew Nicols
9d75a519f3 MDL-56602 themes: Use version number as base themerev 2016-11-10 08:02:31 +08:00
Juan Leyva
6406431537 MDL-56839 upgrade.txt: Fix incorrect information in lib/upgrade.txt 2016-11-09 21:00:33 +00:00
Dan Poltawski
757aef2334 MDL-56766 calendar: improve calendar export labels 2016-11-09 17:00:05 +00:00
Dan Poltawski
2c212753fe MDL-56585 tool_lpimportcsv: adjust help popups 2016-11-09 16:11:41 +00:00
Dan Poltawski
bc2aaef4fa MDL-56832 theme_boost: Mention CSS in setting description 2016-11-09 14:50:07 +00:00
Dan Poltawski
224789b79c Merge branch 'MDL-56863-master' of git://github.com/jleyva/moodle 2016-11-09 14:38:26 +00:00
Juan Leyva
678555b499 MDL-56863 tool_mobile: Capture moodle_exception in get_autologin_key 2016-11-09 13:20:49 +00:00
Dan Poltawski
793fe29014 Merge branch 'MDL-48498-master-iv6-undefinedfix' of https://github.com/snake/moodle 2016-11-09 12:16:03 +00:00
Juan Leyva
82f5802a94 MDL-56754 course: Stealth sections should be handled 
Right now this WS is returning all the sections without advising if is
a stealth section or not, this have some implications (in the mobile
app right now the stealth sections are displayed)
 2016-11-09 09:38:46 +00:00
Andrew Nicols
a2567336df Merge branch 'MDL-56755-m' of https://github.com/micaherne/moodle 2016-11-09 15:42:32 +08:00
Andrew Nicols
4cc6477198 Merge branch 'MDL-56790-master' of git://github.com/damyon/moodle 2016-11-09 15:40:16 +08:00
Damyon Wiese
b8396c335a MDL-56662 boost: Don't mess with display, set min-height 
Changing the display was messing with the layout of some things in the
file picker. Lets set the min-height instead which has less
side-effects.
 2016-11-09 15:14:24 +08:00
Damyon Wiese
eacf30e61f MDL-56051 blocks: Support drag and drop blocks in boost. 2016-11-09 14:42:18 +08:00
Andrew Nicols
55a3911408 Merge branch 'MDL-56726-master-cfgadmin' of git://github.com/mudrd8mz/moodle 2016-11-09 14:37:47 +08:00
David Monllao
4e2ae9caee Merge branch 'MDL-56596-master-fix' of git://github.com/andrewnicols/moodle 2016-11-09 14:35:41 +08:00
David Monllao
33788800ec Merge branch 'MDL-56133' of https://github.com/NeillM/moodle 2016-11-09 14:23:50 +08:00
David Monllao
3f066469af Merge branch 'wip-mdl-56630-fix2' of git://github.com/rajeshtaneja/moodle 2016-11-09 14:14:51 +08:00
Andrew Nicols
f2dab83445 MDL-56596 tool_usertours: Update to tours v0.9.9 2016-11-09 14:10:31 +08:00
David Monllao
38b74ef717 Merge branch 'MDL-56662-master' of git://github.com/damyon/moodle 2016-11-09 13:58:01 +08:00
Rajesh Taneja
d514d25e0a
MDL-56630 behat: Click on link in specificed block/region 2016-11-09 13:56:49 +08:00
Damyon Wiese
f87084f8f1 MDL-56662 theme_boost: Filepickers have 0 height 
We need to set a display value on the file picker body so the inline height is ignored.
 2016-11-09 13:55:45 +08:00
Rajesh Taneja
26ca972e9e
MDL-56840 behat: Wait till pdf conversion progress is finished 2016-11-09 13:39:00 +08:00
Damyon Wiese
ba4173384d MDL-56853 mod_folder: Review styles in boost 
Remove random center-alignment and put buttons on a single line.
 2016-11-09 13:35:08 +08:00
Rajesh Taneja
bd955bfea7
MDL-56397 behat: updated composer.lock to use behat 3.2.2 
Behat 3.2.2 fixes transformation issue
 2016-11-09 13:31:22 +08:00
David Monllao
6e986b2919 Merge branch 'mdl-54852-master' of https://github.com/Dagefoerde/moodle 2016-11-09 13:07:26 +08:00
David Monllao
0c499e0a5c Merge branch 'MDL-53481-master-uniqsqlparam' of git://github.com/mudrd8mz/moodle 2016-11-09 12:49:17 +08:00
David Monllao
7ecf7511f8 Merge branch 'MDL-56694-master' of git://github.com/lameze/moodle 2016-11-09 12:24:17 +08:00
Andrew Nicols
16f9660cfe Merge branch 'MDL-56196-master' of git://github.com/damyon/moodle 2016-11-09 11:59:02 +08:00
Jake Dallimore
c02778ac30 MDL-48498 admin: fix get_setting return for mixedhostiplist setting 2016-11-09 11:32:58 +08:00
Damyon Wiese
50302c404a MDL-56790 boost: Styling fixes for mod_feedback 
Also fixed are problems with frozen select from elements showing raw
HTML. I checked the other form templates for similar problems and fixed
them all.
 2016-11-09 11:29:58 +08:00
Andrew Nicols
cfa4b26231 Merge branch 'MDL-56792-master-v2' of git://github.com/lameze/moodle 2016-11-09 11:27:57 +08:00
Simey Lameze
cff1f90adf MDL-56792 core_charts: clean html content from title and labels 
This commit add cleanData() and call it from all places that has labels or title
to guarantee that html content will not be printed on the chart.
 2016-11-09 10:41:12 +08:00
Andrew Nicols
43bdbbf682 Merge branch 'MDL-56607-master' of git://github.com/jleyva/moodle 2016-11-09 09:39:48 +08:00
Damyon Wiese
3ae54e045a MDL-56845 admin: Change default for adminlinkcategories 
Change the default for adminlinkcategories from false to true because it
helps navigate the site admin settings in boost.
 2016-11-09 09:37:37 +08:00
Eloy Lafuente (stronk7)
6c5ee657a7 Merge branch 'MDL-56699-master' of git://github.com/damyon/moodle 2016-11-09 02:11:55 +01:00
David Monllao
0cbfb7ff2a Merge branch 'MDL-56409-master' of git://github.com/ankitagarwal/moodle 2016-11-09 08:36:36 +08:00
Dan Poltawski
231e2ec99a Merge branch 'MDL-56555-master' of git://github.com/andrewnicols/moodle 2016-11-08 17:56:12 +00:00
Dan Poltawski
e20c8ddc80 Merge branch 'MDL-48498-master-iv6' of https://github.com/snake/moodle 2016-11-08 17:51:17 +00:00
Dan Poltawski
674c4f6891 Merge branch 'MDL-56596-master' of git://github.com/andrewnicols/moodle 2016-11-08 13:43:54 +00:00
David Mudrák
93f4f3494a MDL-53481 availability: Fix uniqueness of SQL named param placeholders 
Static variables do not behave the way you might expect when accessing
them through the classes inheritance. When accessing a method via self::
or static:: operators, even though the method is inherited, its variable
scope is not. So the method unique_sql_parameter() was using the scope
of the child class and each child class had its own sequence of usp1,
usp2, usp3, ... placeholders. This led to "Incorrect number of query
parameters" error when multiuple condition classes were contributing to
a single SQL query.

All credit should go to Adam Olley who debugged and described the
essence of the problem in the tracker.
 2016-11-08 13:36:07 +01:00
Neill Magill
6a6f2e1ca6 MDL-56133 tool_langimport: Changes should be visible after import 
Before this change if a language pack was updated by the
\tool_langimport\task\update_langpacks_task scheduled task, changes
would not be available to users until an admin manually cleared the
strings cache.

This change causes the cache to purged when a language pack it update,
this will cause it to rebuild so users will start seeing updates
automatically.
 2016-11-08 10:56:56 +00:00
Dan Poltawski
258d07d37e Moodle release 3.2beta 
Make Moodle Great Again ;-)
v3.2.0-beta 		2016-11-08 10:25:31 +00:00