Commits · 6ca388028e1831fe98d1f84669e2911f5beba625 · integration / prechecker · GitLab

03 Dec, 2013 18 commits
- Revert "MDL-42932 core_calendar: introduced calendar type system setting" · 6ca38802
  Dan Poltawski authored Dec 03, 2013
```
This reverts commit bb32a499.
```
  6ca38802
- Revert "MDL-42932 core_lib: added missing $CFG declaration" · aa8abbee
  Dan Poltawski authored Dec 03, 2013
```
This reverts commit 4c61097c.
```
  aa8abbee
- Merge branch 'time-limit-fix' of https://github.com/danpoltawski/moodle · 8f49492a
  Damyon Wiese authored Dec 03, 2013
  
  8f49492a
- MDL-42084 lib: fix undefined variable warnings · 0b2f11db
  Dan Poltawski authored Dec 03, 2013
  
  0b2f11db
- Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle · 753eb47e
  Dan Poltawski authored Dec 03, 2013
  
  753eb47e
- Merge branch 'MDL-43076-master' of git://github.com/phalacee/moodle · 6b8c6278
  Damyon Wiese authored Dec 03, 2013
```
Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  6b8c6278
- Merge branch 'MDL-43081-master' of git://github.com/danpoltawski/moodle · e7af6363
  Damyon Wiese authored Dec 03, 2013
```
Conflicts:
	lib/upgrade.txt
```
  e7af6363
- Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle · 4ab19f9c
  Dan Poltawski authored Dec 03, 2013
  
  4ab19f9c
- Merge branch 'MDL-42738_master' of git://github.com/dmonllao/moodle · ebe05179
  Dan Poltawski authored Dec 03, 2013
  
  ebe05179
- Merge branch 'MDL-43066_master' of git://github.com/dmonllao/moodle · 03742ae8
  Dan Poltawski authored Dec 03, 2013
  
  03742ae8
- Merge branch 'wip-mdl-43048' of https://github.com/rajeshtaneja/moodle · b3d252a6
  Damyon Wiese authored Dec 03, 2013
  
  b3d252a6
- Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle · cd515a94
  Dan Poltawski authored Dec 03, 2013
  
  cd515a94
- MDL-42932 core_lib: added missing $CFG declaration · 4c61097c
  Mark Nelson authored Dec 02, 2013
  
  4c61097c
- Merge branch 'wip-mdl-42904' of https://github.com/rajeshtaneja/moodle · de3e0d20
  Damyon Wiese authored Dec 03, 2013
```
Conflicts:
	enrol/self/db/upgrade.php
```
  de3e0d20
- Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle · 8d8e6f96
  Dan Poltawski authored Dec 03, 2013
  
  8d8e6f96
- Merge branch 'MDL-40939-master' of https://github.com/timgus/moodle · 13410584
  Damyon Wiese authored Dec 03, 2013
```
Conflicts:
	filter/tex/version.php
	lang/en/admin.php
```
  13410584
- Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle · a59a4239
  Sam Hemelryk authored Dec 03, 2013
  
  a59a4239
- Merge branch 'w48_MDL-41819_m27_maxinputvars' of https://github.com/skodak/moodle · b5fd2497
  Sam Hemelryk authored Dec 03, 2013
  
  b5fd2497
02 Dec, 2013 22 commits
- Merge branch 'wip-MDL-39286-master' of git://github.com/ds125v/moodle · 2a1e730e
  Damyon Wiese authored Dec 02, 2013
  
  2a1e730e
- MDL-32888: Whitespace fixes (grr) · 2b267d31
  Damyon Wiese authored Dec 02, 2013
  
  2b267d31
- Merge branch 'MDL-32888_master' of https://github.com/maitkin-ltu/moodle · 7363aacb
  Damyon Wiese authored Dec 02, 2013
  
  7363aacb
- Merge branch 'MDL-42989-master' of git://github.com/andrewnicols/moodle · 6bc8b35a
  Dan Poltawski authored Dec 02, 2013
  
  6bc8b35a
- Merge branch 'm27_MDL-43039_SessionDiskFull_False_Positive' of https://github.com/scara/moodle · cc9651dc
  Damyon Wiese authored Dec 02, 2013
  
  cc9651dc
- MDL-42989 Admin: Clean output when building site administration tree for JS · 0bb56f2e
  Andrew Nicols authored Nov 28, 2013
```
Previously, any inappropriate whitespace found whilst building the admin
tree caused a JSON error and for the site administration tree retrieval to
fail.

This change ensures that access to the site administration tree is unbroken
for non-developers, whilst still alerting developers that there is an
issue.
```
  0bb56f2e
- Merge branch 'MDL-42969-master' of git://github.com/mouneyrac/moodle · 4b9e9fcb
  Dan Poltawski authored Dec 02, 2013
  
  4b9e9fcb
- MDL-43066 behat: Checking that the site is not already installed · 0e825e5d
  David Monllaó authored Nov 26, 2013
  
  0e825e5d
- MDL-43018 Fix unit tests for minify changes. · bd3811f1
  Damyon Wiese authored Dec 02, 2013
  
  bd3811f1
- Merge branch 'MDL-40040-master' of git://github.com/ankitagarwal/moodle · df68e738
  Damyon Wiese authored Dec 02, 2013
  
  df68e738
- MDL-40040 Cleanup some blog methods and replace add_to_log · 6b364115
  Ankit Agarwal authored Nov 21, 2013
```
Cleaned up add_association()
cleaned up add_associations()
Replaced remaining add_to_log() in blogs with events
```
  6b364115
- MDL-40040 events: Add unit tests for blog events · cf0116db
  Ankit Agarwal authored Nov 21, 2013
  
  cf0116db
- MDL-40040 events: Add blog events · 16493157
  Ankit Agarwal authored Nov 21, 2013
```
Added blog_entries_viewed
Added blog_association_created
```
  16493157
- Merge branch 'w49_MDL-43106_m27_doublecookie' of https://github.com/skodak/moodle · 466aa444
  Dan Poltawski authored Dec 02, 2013
  
  466aa444
- Merge branch 'MDL-43018-master' of git://github.com/andrewnicols/moodle · 8d68ea72
  Damyon Wiese authored Dec 02, 2013
  
  8d68ea72
- Merge branch 'wip-MDL-40191-master' of git://github.com/marinaglancy/moodle · 10c12c94
  Dan Poltawski authored Dec 02, 2013
  
  10c12c94
- Merge branch 'MDL-43068' of git://github.com/timhunt/moodle · 9a7de39d
  Dan Poltawski authored Dec 02, 2013
  
  9a7de39d
- Merge branch '43033-27' of git://github.com/samhemelryk/moodle · ecfbb657
  Damyon Wiese authored Dec 02, 2013
  
  ecfbb657
- Merge branch 'MDL-42876-master' of git://github.com/mouneyrac/moodle · c619d3d4
  Sam Hemelryk authored Dec 02, 2013
  
  c619d3d4
- Merge branch 'MDL-42918' of git://github.com/rwijaya/moodle · 12539749
  Sam Hemelryk authored Dec 02, 2013
```
Conflicts:
	theme/bootstrapbase/style/moodle.css
```
  12539749
- MDL-41819 try to work around max_input_vars restriction · a3777547
  Petr Škoda authored Nov 18, 2013
  
  a3777547
- Merge branch 'MDL-42951-master' of git://github.com/FMCorz/moodle · f2d7e2dc
  Sam Hemelryk authored Dec 02, 2013
  
  f2d7e2dc