mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity
71,178 Commits 36 Branches 519 Tags
Commit Graph

71178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amanda Doughty
cc6dee5856 MDL-35696 enrol_meta: Fixed course sort order 2014-11-24 10:19:17 +00:00
Dan Poltawski
ca0e301c7b weekly release 2.9dev 2014-11-20 08:38:12 +00:00
Dan Poltawski
796f50a8d4 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-11-20 08:38:09 +00:00
Dan Poltawski
17d4ff23ee Revert "MDL-46531 Make atto foreground colors and background colors configurable" 
This reverts commit cb6e1d527093bb955946498850ef8a51276a13a4.

This reverts commit 7a5e6054248ef18f05a228ab0db4d05e5d782180, reversing
changes made to 7b9fb265d20e53580a64dcd2be8546ff5b49bd26.

This reverts commit 06404b01180a2965804fab9e47715fdc2b6bdfb4, reversing
changes made to 0f87473fed2da15a8ba72ac9a578734fe2548f10.

Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-20 07:04:41 +00:00
Sam Hemelryk
11b5e41b0c NOBUG: fixed commit message typo 2014-11-20 16:47:33 +13:00
Andrew Nicols
cb6e1d5270 MDL-46531 editor_atto: fontcolor -> backcolor 2014-11-20 10:46:04 +08:00
Sam Hemelryk
2949dedcda MDL-43628 mod_assign: fixed formatting of statement 2014-11-20 10:18:28 +13:00
Eloy Lafuente (stronk7)
4067991016 Merge branch '48206-29' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-19 21:28:51 +01:00
Sam Hemelryk
7a5e605424 Merge branch 'MDL-46531-fixes' of git://github.com/andrewnicols/moodle 2014-11-20 09:12:14 +13:00
Rajesh Taneja
7b9fb265d2 MDL-48251 behat: Shuffling activity creation fix quiz behat 2014-11-19 20:07:07 +01:00
Dan Poltawski
72e3cb9ad2 MDL-29585 wiki: fix unit test fails 2014-11-19 11:37:35 +00:00
Dan Poltawski
b4fc107a35 Merge branch 'MDL-29585-master-fixup' of https://github.com/FMCorz/moodle 2014-11-19 10:29:10 +00:00
Frederic Massart
414f7ef8ff MDL-29585 mod_wiki: Prevent broken links in editable sections 
When a section name ended with a URL, the '<a' part of [edit] link
that is appended to the section was considered as part of the URL
in the section, thus causing the [edit] link to be broken.
 2014-11-19 17:28:36 +08:00
Andrew Nicols
db97ff0ee6 MDL-46531 editor_atto: Handle a null selection better on colour change 
Sadly, there is no easy way to do this. When a range is empty, we need to
create a new span, make the changes there, and then select it. Rangy does
not provide a helper to do this yet (will be in 1.3) so we have to do it
manually in the mean time.
 2014-11-19 15:45:37 +08:00
Dan Poltawski
23842d8c50 Merge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle 2014-11-19 06:39:35 +00:00
Rajesh Taneja
e1d138a74f MDL-46865 report_log: Fixed site name in behat step 2014-11-19 10:17:32 +08:00
Sam Hemelryk
a74d4743e1 MDL-33606 event: moved upgrade notice 2014-11-19 09:38:55 +13:00
Sam Hemelryk
469c32955a Merge branch 'MDL-33606_master' of git://github.com/dmonllao/moodle 2014-11-19 09:37:19 +13:00
Sam Hemelryk
756350b82d Merge branch 'MDL-47587' of git://github.com/jmvedrine/moodle 2014-11-19 09:18:36 +13:00
Mary Evans
a263396486 MDL-47915 theme: use id='page-content' rather than 'content'. 
Also added JS fallback for themes using copied layouts in scorm
 2014-11-18 17:49:57 +00:00
Gilles-Philippe Leblanc
af14ef657a MDL-47501 gradebook: Add an indication that the grade letters was overridden 2014-11-18 17:13:40 +00:00
Helen Foster
ee7a1a546c MDL-47800 admin: improved strings 2014-11-18 16:35:38 +00:00
Dan Poltawski
eb0acfa311 Merge branch 'wip_MDL-47800_m28_pwchange2' of git://github.com/skodak/moodle 2014-11-18 16:32:57 +00:00
AMOS bot
e368d245c4 Automatically generated installer lang files 2014-11-19 00:05:38 +08:00
Dan Poltawski
c8b01e0c7d Merge branch 'MDL36874_Text_navigation_for_Books' of git://github.com/Dave-B/moodle 
Conflicts:
	mod/book/version.php
	mod/book/db/upgrade.php
 2014-11-18 13:54:05 +00:00
Dan Poltawski
0bd55a3322 Merge branch '47434-29-1' of git://github.com/samhemelryk/moodle 2014-11-18 13:22:41 +00:00
Dan Poltawski
8d3fba4ce4 Merge branch 'm28_MDL-48041' of https://github.com/totara/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-18 13:10:57 +00:00
Dan Poltawski
de134194b9 Merge branch 'MDL-48146' of git://github.com/timhunt/moodle 2014-11-18 12:04:48 +00:00
Dan Poltawski
39da77774a Merge branch 'wip_MDL-47803_m28_usersessions2' of https://github.com/skodak/moodle 2014-11-18 10:15:06 +00:00
Dan Poltawski
7baf2d1634 Merge branch 'MDL-47700-master' of git://github.com/xow/moodle 2014-11-18 10:04:33 +00:00
Jean-Michel Vedrine
31f386732b MDL-47587 Lesson: Display progress bar on the end of lesson page 2014-11-18 08:49:22 +01:00
Sam Hemelryk
1b4af6f371 Merge branch 'wip-mdl-48250' of https://github.com/rajeshtaneja/moodle 2014-11-18 17:37:57 +13:00
Sam Hemelryk
2f365ee4aa Merge branch 'wip-MDL-43205-master' of git://github.com/abgreeve/moodle 2014-11-18 16:48:27 +13:00
Sam Hemelryk
7b604fd9f1 Merge branch 'MDL-29585-master' of git://github.com/FMCorz/moodle 2014-11-18 16:47:24 +13:00
Eloy Lafuente (stronk7)
ea1720be99 Merge branch '48070-29' of git://github.com/samhemelryk/moodle 2014-11-18 03:41:28 +01:00
Petr Skoda
8064168e3c MDL-47803 Add report that lists user sessions 2014-11-18 13:55:11 +13:00
Sam Hemelryk
5b9a75e1fe Merge branch 'MDL-47527_master' of https://github.com/StudiUM/moodle 2014-11-18 13:34:29 +13:00
Sam Hemelryk
817e9010c1 Merge branch 'MDL-47618' of git://github.com/timhunt/moodle 2014-11-18 11:12:28 +13:00
Sam Hemelryk
6067a4c87c Merge branch 'MDL-47777_master' of https://github.com/Syxton/moodle 2014-11-18 10:57:29 +13:00
Sam Hemelryk
06404b0118 Merge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-18 10:48:31 +13:00
Sam Hemelryk
699f60c6f7 MDL-48070 navbar: ensure navigation initialised 2014-11-18 09:55:36 +13:00
Petr Skoda
866f03de46 MDL-47800 auth: Add option to logout on pw change 2014-11-18 09:51:52 +13:00
Dan Poltawski
0f87473fed Merge branch 'MDL-30619_master' of https://github.com/markn86/moodle 2014-11-17 16:48:27 +00:00
Dan Poltawski
34a0b00d4a Merge branch 'MDL-48199-master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-17 16:42:34 +00:00
Dan Poltawski
b4dd8e28cd Merge branch '48070-29' of git://github.com/samhemelryk/moodle 2014-11-17 16:22:26 +00:00
Dan Poltawski
122cabb41e Merge branch 'MDL-47648' of git://github.com/timhunt/moodle 2014-11-17 15:39:48 +00:00
Dan Poltawski
d012fad7d9 Merge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle 2014-11-17 15:33:45 +00:00
Dan Poltawski
296e292413 Merge branch 'm29_MDL-48023_Theme_Setting_Files_Cacheable_By_Both_Browsers_And_Proxies' of https://github.com/scara/moodle 2014-11-17 15:20:17 +00:00
Dan Poltawski
8776094d6d Merge branch 'MDL-48042_wip' of git://github.com/ppichet/moodle 2014-11-17 15:12:56 +00:00
Dan Poltawski
96ac6cb964 Merge branch 'MDL-42756' of git://github.com/aolley/moodle 2014-11-17 13:52:39 +00:00