mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-23 00:50:15 +01:00
Code Issues Projects Releases Wiki Activity
82,551 Commits 36 Branches 527 Tags
Commit Graph

82551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
589449b81e Merge branch 'MDL-57080-m' of https://github.com/micaherne/moodle 2017-01-02 12:15:01 +00:00
Dan Poltawski
6dbe175454 Merge branch 'MDL-57395-master' of git://github.com/jleyva/moodle 2017-01-02 11:46:44 +00:00
Dan Poltawski
25a222734e Merge branch 'wip-MDL-57464-master' of git://github.com/abgreeve/moodle 2017-01-02 11:16:27 +00:00
Dan Poltawski
5fd78ba412 MDL-57532 calendar: tidy up button grouping 2017-01-02 10:44:35 +00:00
Dan Poltawski
77e1c18727 Merge branch 'MDL-57532_m33v1' of https://github.com/sbourget/moodle 2017-01-02 10:34:58 +00:00
David Monllao
f3b3901822 Merge branch 'MDL-56926_master' of git://github.com/dmonllao/moodle 2016-12-30 09:59:45 +01:00
David Monllao
6229657584 MDL-56926 theme_boost: Restore filepicker's filename and icons original spacing 2016-12-30 09:39:38 +01:00
Nadav Kavalerchik
2c8dd8e312 MDL-56926 Theme/Boost: Fix filepicker folder tree YUI guides 2016-12-30 09:38:11 +01:00
Dan Poltawski
4053aa77fa Merge branch 'MDL-57512-master' of git://github.com/crazyserver/moodle 2016-12-29 11:50:50 +00:00
Dan Poltawski
5d970e1aa0 Merge branch 'master_MDL-50643' of git://github.com/danmarsden/moodle 2016-12-29 11:46:47 +00:00
Pau Ferrer Ocaña
7180cdc7b5 MDL-57512 categories: Use maxcategorydepth only when getting all cats 2016-12-29 11:30:57 +01:00
David Monllao
7eeb375380 Merge branch 'MDL-57338-master' of git://github.com/danpoltawski/moodle 2016-12-29 10:44:01 +01:00
Dan Poltawski
9f85876247 MDL-57338 templates: fix missing example variables 
From Davids review, thanks
 2016-12-29 08:03:47 +00:00
David Monllao
125fa61a15 MDL-57471 forms: Removing unresolved conflict line 2016-12-29 08:54:36 +01:00
David Monllao
3655a459b4 Merge branch 'MDL-57471-master' of git://github.com/danpoltawski/moodle 2016-12-29 08:43:37 +01:00
David Monllao
edda5120e2 Merge branch 'MDL-57331-master' of https://github.com/xow/moodle 2016-12-28 21:21:04 +00:00
Dan Poltawski
a92fc9b45e Merge branch 'MDL-57451-master' of https://github.com/lucisgit/moodle 2016-12-28 21:19:03 +00:00
Dan Poltawski
398e8fa1ed Merge branch 'MDL-55955_master' of git://github.com/markn86/moodle 2016-12-28 21:19:03 +00:00
Dan Poltawski
16cfeccad8 Merge branch 'wip-MDL-57366-master' of git://github.com/abgreeve/moodle 2016-12-28 21:19:02 +00:00
David Monllao
bbcdd56c8f Merge branch 'MDL-57491_m33v3' of https://github.com/sbourget/moodle 2016-12-28 21:19:01 +00:00
David Monllao
7454d5fb37 Merge branch 'MDL-57472-master' of git://github.com/danpoltawski/moodle 2016-12-28 21:19:01 +00:00
Dan Poltawski
79be02bf8d Merge branch 'MDL-57417-master' of https://github.com/snake/moodle 2016-12-28 21:19:00 +00:00
David Monllao
564630322c Merge branch 'MDL-52366-master-mustachethemedir' of git://github.com/mudrd8mz/moodle 2016-12-28 12:22:52 +01:00
David Monllao
cc31be4ffc Merge branch 'MDL-57450-master' of git://github.com/danpoltawski/moodle 2016-12-28 11:45:34 +01:00
Dan Poltawski
66b68d631d Merge branch 'wip-MDL-57251-master' of git://github.com/abgreeve/moodle 2016-12-28 10:32:50 +00:00
Juan Leyva
879a8f56c9 MDL-57395 course: New Web Service core_course_get_updates_since 2016-12-28 11:24:40 +01:00
David Monllao
e4b7ad0f6d Merge branch 'MDL-57357-master' of https://github.com/snake/moodle 2016-12-28 11:15:29 +01:00
David Monllao
f32ff507e2 Merge branch 'MDL-56488-master' of git://github.com/danpoltawski/moodle 2016-12-28 10:58:13 +01:00
Dan Poltawski
83c7b312cd Merge branch 'wip-MDL-57292-master' of git://github.com/abgreeve/moodle 2016-12-28 09:13:29 +00:00
Dan Poltawski
20ad9c7b4e Merge branch 'MDL-57474-master-messageid' of git://github.com/mudrd8mz/moodle 2016-12-28 08:56:12 +00:00
Stephen Bourget
d1ee1e5f55 MDL-57532 calendar: Add missing bootstrap classes 2016-12-26 11:33:35 -05:00
Dan Poltawski
0e34e46fd0 MDL-56488 boost: validate scss settings for parsable scss 
* Parses the scss and fails validation if a parse error is found

* Does not detect the situation when variables are not present - this
  would involve us parsing the entire tree and would be slow. It could
  also change over time, depending on whats defined in the scss
  from themes.

* Introduces a new admin_setting_scsscode to do this
 2016-12-23 09:51:29 +00:00
Adrian Greeve
a7eb619b76 MDL-57464 mod_lesson: fix notice with sub-clusters. 2016-12-23 11:10:20 +08:00
Jake Dallimore
a545224b9d MDL-57357 auth: add behat coverage for remember username login feature 2016-12-23 11:01:56 +08:00
Jake Dallimore
8f8ae115bc MDL-57357 auth: fix the remember username feature on login page 2016-12-23 10:42:01 +08:00
Jake Dallimore
c41883f0bb MDL-57417 navigation: fix legacy_activity_onclick_handler callback scope 2016-12-23 08:40:17 +08:00
Dan Marsden
9536334dca MDL-50643 mod_scorm: redirect using current window instead of parent. 2016-12-23 10:17:43 +13:00
Stephen Bourget
e762783dc0 MDL-57491 report_log: Improve filtering code by using static entries 2016-12-22 16:11:36 -05:00
Dan Poltawski
514ab739fb MDL-57338 message: fix template component 2016-12-22 12:50:38 +00:00
Dan Poltawski
2d29386c44 MDL-57338 templates: add missing example context 2016-12-22 12:50:37 +00:00
Dan Poltawski
b4a65796cf MDL-57338 chart: add example context 
And fix aria roles
 2016-12-22 12:50:25 +00:00
Dan Poltawski
2f74b07e92 MDL-57338 mustache: fix admin_setting_tabs 
* Add example context
* Fix validation issue (need role="tablist" to contain the tabs)
 2016-12-22 12:31:28 +00:00
Dan Poltawski
57378aac0b MDL-57472 javascript-static: remove fix_column_widths() 
A bit of a hack applied nearly 12 years ago in
7979105c629050e744b9e889a95b6984cf912b03
 2016-12-22 12:22:15 +00:00
Dan Poltawski
2fa2ed50eb MDL-57471 forms: deprecate init_javascript_enhancement() 
This was half-finished and only used for the smartselect enhancement. That
enhancement doesn't work with theme_boost and is better replaced just
using the searchableselector element.
 2016-12-22 12:19:51 +00:00
Michael Aherne
1afea82da0 MDL-57080 completion: Update completion expected date on reset 2016-12-22 11:37:51 +00:00
Tony Butler
3132ba0278 MDL-57451 theme_boost: Add checkboxgroup class to checkbox input element 2016-12-22 11:29:55 +00:00
Dan Poltawski
c4cf1c60f5 weekly release 3.3dev 2016-12-22 08:15:04 +00:00
Dan Poltawski
3a4eba7aa0 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-12-22 08:15:02 +00:00
Adrian Greeve
c496632681 MDL-57292 tool_lpimportcsv: Fix for unit tests. 2016-12-22 13:06:40 +08:00
Mark Nelson
cc4fba8636 MDL-55955 mod_quiz: ensure duplicated override events are removed 2016-12-22 12:41:32 +08:00