Commits · bb554eb4efee47240977ab79f8f4503af4cb5ddb · moodle / moodle · GitLab

22 Nov, 2014 1 commit
- MDL-48335 phpdoc: cleaned up @package in lang files · bb554eb4
  Sam Hemelryk authored Nov 22, 2014
  
  bb554eb4
20 Nov, 2014 9 commits
- weekly release 2.9dev · ca0e301c
  Dan Poltawski authored Nov 20, 2014
  
  ca0e301c
- Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install · 796f50a8
  Dan Poltawski authored Nov 20, 2014
  
  796f50a8
- Revert "MDL-46531 Make atto foreground colors and background colors configurable" · 17d4ff23
  Dan Poltawski authored Nov 20, 2014
```
This reverts commit cb6e1d52.

This reverts commit 7a5e6054, reversing
changes made to 7b9fb265.

This reverts commit 06404b01, reversing
changes made to 0f87473f.

Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  17d4ff23
- NOBUG: fixed commit message typo · 11b5e41b
  Sam Hemelryk authored Nov 20, 2014
  
  11b5e41b
- MDL-46531 editor_atto: fontcolor -> backcolor · cb6e1d52
  Andrew Nicols authored Nov 20, 2014
  
  cb6e1d52
- MDL-43628 mod_assign: fixed formatting of statement · 2949dedc
  Sam Hemelryk authored Nov 20, 2014
  
  2949dedc
- Merge branch '48206-29' of git://github.com/samhemelryk/moodle · 40679910
  Eloy Lafuente authored Nov 19, 2014
```
Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  40679910
- Merge branch 'MDL-46531-fixes' of git://github.com/andrewnicols/moodle · 7a5e6054
  Sam Hemelryk authored Nov 20, 2014
  
  7a5e6054
- MDL-48251 behat: Shuffling activity creation fix quiz behat · 7b9fb265
  Rajesh Taneja authored Nov 19, 2014 and Eloy Lafuente committed Nov 19, 2014
  
  7b9fb265
19 Nov, 2014 14 commits
- MDL-29585 wiki: fix unit test fails · 72e3cb9a
  Dan Poltawski authored Nov 19, 2014
  
  72e3cb9a
- Merge branch 'MDL-29585-master-fixup' of https://github.com/FMCorz/moodle · b4fc107a
  Dan Poltawski authored Nov 19, 2014
  
  b4fc107a
- MDL-29585 mod_wiki: Prevent broken links in editable sections · 414f7ef8
  Frederic Massart authored Nov 19, 2014
```
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.
```
  414f7ef8
- MDL-46531 editor_atto: Handle a null selection better on colour change · db97ff0e
  Andrew Nicols authored Nov 19, 2014
```
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.
```
  db97ff0e
- Merge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle · 23842d8c
  Dan Poltawski authored Nov 19, 2014
  
  23842d8c
- MDL-46865 report_log: Fixed site name in behat step · e1d138a7
  Rajesh Taneja authored Nov 19, 2014
  
  e1d138a7
- MDL-33606 event: moved upgrade notice · a74d4743
  Sam Hemelryk authored Nov 19, 2014
  
  a74d4743
- Merge branch 'MDL-33606_master' of git://github.com/dmonllao/moodle · 469c3295
  Sam Hemelryk authored Nov 19, 2014
  
  469c3295
- Merge branch 'MDL-47587' of git://github.com/jmvedrine/moodle · 756350b8
  Sam Hemelryk authored Nov 19, 2014
  
  756350b8
- MDL-47915 theme: use id='page-content' rather than 'content'. · a2633964
  Mary Evans authored Oct 28, 2014 and Dan Poltawski committed Nov 18, 2014
```
Also added JS fallback for themes using copied layouts in scorm
```
  a2633964
- MDL-47501 gradebook: Add an indication that the grade letters was overridden · af14ef65
  Gilles-Philippe Leblanc authored Oct 03, 2014 and Dan Poltawski committed Nov 18, 2014
  
  af14ef65
- MDL-47800 admin: improved strings · ee7a1a54
  Helen Foster authored Nov 18, 2014 and Dan Poltawski committed Nov 18, 2014
  
  ee7a1a54
- Merge branch 'wip_MDL-47800_m28_pwchange2' of git://github.com/skodak/moodle · eb0acfa3
  Dan Poltawski authored Nov 18, 2014
  
  eb0acfa3
- Automatically generated installer lang files · e368d245
  AMOS Bot authored Nov 19, 2014
  
  e368d245
18 Nov, 2014 16 commits
- Merge branch 'MDL36874_Text_navigation_for_Books' of git://github.com/Dave-B/moodle · c8b01e0c
  Dan Poltawski authored Nov 18, 2014
```
Conflicts:
	mod/book/version.php
	mod/book/db/upgrade.php
```
  c8b01e0c
- Merge branch '47434-29-1' of git://github.com/samhemelryk/moodle · 0bd55a33
  Dan Poltawski authored Nov 18, 2014
  
  0bd55a33
- Merge branch 'm28_MDL-48041' of https://github.com/totara/moodle · 8d3fba4c
  Dan Poltawski authored Nov 18, 2014
```
Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  8d3fba4c
- Merge branch 'MDL-48146' of git://github.com/timhunt/moodle · de134194
  Dan Poltawski authored Nov 18, 2014
  
  de134194
- Merge branch 'wip_MDL-47803_m28_usersessions2' of https://github.com/skodak/moodle · 39da7777
  Dan Poltawski authored Nov 18, 2014
  
  39da7777
- Merge branch 'MDL-47700-master' of git://github.com/xow/moodle · 7baf2d16
  Dan Poltawski authored Nov 18, 2014
  
  7baf2d16
- MDL-47587 Lesson: Display progress bar on the end of lesson page · 31f38673
  Jean-Michel Vedrine authored Oct 21, 2014
  
  31f38673
- Merge branch 'wip-mdl-48250' of https://github.com/rajeshtaneja/moodle · 1b4af6f3
  Sam Hemelryk authored Nov 18, 2014
  
  1b4af6f3
- Merge branch 'wip-MDL-43205-master' of git://github.com/abgreeve/moodle · 2f365ee4
  Sam Hemelryk authored Nov 18, 2014
  
  2f365ee4
- Merge branch 'MDL-29585-master' of git://github.com/FMCorz/moodle · 7b604fd9
  Sam Hemelryk authored Nov 18, 2014
  
  7b604fd9
- Merge branch '48070-29' of git://github.com/samhemelryk/moodle · ea1720be
  Eloy Lafuente authored Nov 18, 2014
  
  ea1720be
- MDL-47803 Add report that lists user sessions · 8064168e
  Petr Skoda authored Nov 18, 2014
  
  8064168e
- Merge branch 'MDL-47527_master' of https://github.com/StudiUM/moodle · 5b9a75e1
  Sam Hemelryk authored Nov 18, 2014
  
  5b9a75e1
- Merge branch 'MDL-47618' of git://github.com/timhunt/moodle · 817e9010
  Sam Hemelryk authored Nov 18, 2014
  
  817e9010
- Merge branch 'MDL-47777_master' of https://github.com/Syxton/moodle · 6067a4c8
  Sam Hemelryk authored Nov 18, 2014
  
  6067a4c8
- Merge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle · 06404b01
  Sam Hemelryk authored Nov 18, 2014
```
Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  06404b01