Commits · 9ffa4cb3a676a02bff8997ff0ec8022668d780e1 · integration / prechecker · GitLab

08 Aug, 2013 2 commits
- MDL-22236 user webservice: add_user_private_files · 9ffa4cb3
  Damyon Wiese authored Aug 08, 2013
```
Add webservice for adding files to user private files.
```
  9ffa4cb3
- MDL-22236 Webservice file upload - Allow webservice file uploads direct to a draft filearea. · 106c55fb
  Damyon Wiese authored Jan 17, 2013
```
Via post to /webservice/upload.php
```
  106c55fb
07 Aug, 2013 8 commits
- Merge branch 'MDL-40662_master' of https://github.com/markn86/moodle · f05ea82c
  Sam Hemelryk authored Aug 07, 2013
  
  f05ea82c
- MDL-40662 block_course_overview: added addinstance capability string · a739ff73
  Mark Nelson authored Aug 07, 2013
  
  a739ff73
- Merge branch 'MDL-40934-master' of git://github.com/FMCorz/moodle · d4519366
  Sam Hemelryk authored Aug 07, 2013
```
Conflicts:
	version.php
```
  d4519366
- MDL-40934 core: Bump version requiring major upgrade · 4d075206
  Frederic Massart authored Aug 07, 2013
  
  4d075206
- Merge branch 'MDL-40086-master' of git://github.com/FMCorz/moodle · 823c0c80
  Sam Hemelryk authored Aug 07, 2013
```
Conflicts:
	lib/filestorage/file_storage.php
```
  823c0c80
- Merge branch 'w32_MDL-40438_m26_textlib' of https://github.com/skodak/moodle · 774b1089
  Sam Hemelryk authored Aug 07, 2013
```
Conflicts:
	lib/weblib.php
```
  774b1089
- MDL-41023 weblib: improved coding style · 2e1d38db
  Sam Hemelryk authored Aug 05, 2013
  
  2e1d38db
- MDL-40438 migrate all collatorlib:: and textlib:: uses · 2f1e464a
  Petr Škoda authored Aug 06, 2013
  
  2f1e464a
06 Aug, 2013 30 commits
- Merge branch 'wip-MDL-41025-m26' of git://github.com/samhemelryk/moodle · e7c21ac3
  Marina Glancy authored Aug 07, 2013
  
  e7c21ac3
- Merge branch 'wip-MDL-41024-m26' of git://github.com/samhemelryk/moodle · 25b8ce92
  Marina Glancy authored Aug 07, 2013
  
  25b8ce92
- Merge branch 'wip-mdl-40126' of git://github.com/rajeshtaneja/moodle · 9be9b412
  Marina Glancy authored Aug 06, 2013
  
  9be9b412
- Merge branch 'MDL-40935-master' of git://github.com/ankitagarwal/moodle · 18a43353
  Marina Glancy authored Aug 06, 2013
  
  18a43353
- MDL-40682 MDL-41000 event name and description return strings · 2cf88d54
  Marina Glancy authored Aug 06, 2013
```
event description is non-localised string
```
  2cf88d54
- Merge branch 'MDL-40682-master' of git://github.com/ankitagarwal/moodle · 4b96f2ae
  Marina Glancy authored Aug 06, 2013
  
  4b96f2ae
- MDL-41034 Additional check to be extra sure that no JS error occurs · 287e2a34
  Marina Glancy authored Aug 06, 2013
  
  287e2a34
- Merge branch 'MDL-41034-essay-broken' of git://github.com/ktemkin/moodle · e7328732
  Marina Glancy authored Aug 06, 2013
  
  e7328732
- MDL-40682 events: Add phpdocs for class and init method · c1ff221e
  Ankit Agarwal authored Aug 06, 2013
  
  c1ff221e
- MDL-40935 phpunit: Remove assertLegacyEventName() since get_legacy_eventname() is public now · 320aee33
  Ankit Agarwal authored Aug 06, 2013
  
  320aee33
- MDL-40935 events: get_legacy_eventname() should be public and static · 22446003
  Ankit Agarwal authored Jul 31, 2013
  
  22446003
- MDL-40086 file: Correct ordering of subdirectories · bc42e979
  Frederic Massart authored Aug 06, 2013
```
Thanks to Mohamed Alsharaf for the proposed solution.
```
  bc42e979
- Merge branch 'MDL-34989-master' of git://github.com/damyon/moodle · 36671670
  Sam Hemelryk authored Aug 06, 2013
  
  36671670
- Merge branch 'wip-mdl-41000' of git://github.com/rajeshtaneja/moodle · d2132f02
  Sam Hemelryk authored Aug 06, 2013
  
  d2132f02
- Merge branch 'MDL-40947-master' of https://github.com/lucisgit/moodle · 9c83b82b
  Sam Hemelryk authored Aug 06, 2013
  
  9c83b82b
- Merge branch 'wip-mdl-40469' of git://github.com/rajeshtaneja/moodle · 2ad4a763
  Sam Hemelryk authored Aug 06, 2013
  
  2ad4a763
- Merge branch 'MDL-40420' of https://github.com/prateeksachan/moodle · 206f18c8
  Sam Hemelryk authored Aug 06, 2013
  
  206f18c8
- Merge branch 'MDL-37962_beep' of git://github.com/andyjdavis/moodle · 0fb7a903
  Marina Glancy authored Aug 06, 2013
  
  0fb7a903
- Merge branch 'w32_MDL-41002_m26_enroltypo' of https://github.com/skodak/moodle · 5261f26e
  Sam Hemelryk authored Aug 06, 2013
  
  5261f26e
- Merge branch 'MDL-31226-master' of https://github.com/lucisgit/moodle · 87934924
  Marina Glancy authored Aug 06, 2013
  
  87934924
- Merge branch 'w32_MDL-41020_m26_umaskpermissionsnotice' of https://github.com/skodak/moodle · 1d92024f
  Sam Hemelryk authored Aug 06, 2013
  
  1d92024f
- MDL-27953 auth: documented the newly introduced function can_be_manually_set() in upgrade.txt · b573724a
  Mark Nelson authored Aug 06, 2013
  
  b573724a
- Merge branch 'w32_MDL-40815_m26_deprevent' of https://github.com/skodak/moodle · 17440b21
  Sam Hemelryk authored Aug 06, 2013
```
Conflicts:
	lib/deprecatedlib.php
```
  17440b21
- MDL-37962 core_message:reimplemented the beep on new message functionality from 1.9 · 9279cae6
  Andrew Davis authored Feb 22, 2013
  
  9279cae6
- Merge branch 'MDL-40737-master' of git://github.com/FMCorz/moodle · f0655ecb
  Marina Glancy authored Aug 06, 2013
  
  f0655ecb
- Merge branch 'MDL-40870' of https://github.com/moodlerooms/moodle · 68736bd6
  Sam Hemelryk authored Aug 06, 2013
  
  68736bd6
- Merge branch 'MDL-40662_master' of https://github.com/markn86/moodle · c3aefeb5
  Sam Hemelryk authored Aug 06, 2013
  
  c3aefeb5
- Merge branch 'MDL-40934-master' of git://github.com/FMCorz/moodle · e145762b
  Sam Hemelryk authored Aug 06, 2013
```
Conflicts:
	auth/tests/auth_test.php
```
  e145762b
- NOBUG: fixed whitespace · 3550fc28
  Sam Hemelryk authored Aug 06, 2013
  
  3550fc28
- Merge branch 'MDL-40963-master' of git://github.com/ankitagarwal/moodle · 471dd4ff
  Sam Hemelryk authored Aug 06, 2013
  
  471dd4ff