Eloy Lafuente (stronk7)
3ed255dc1a
Merge branch 'MDL-41604-master-5' of git://github.com/mouneyrac/moodle
2013-10-11 01:33:21 +02:00
Petr Škoda
b5486ce89b
MDL-41953 add more tests for invalid plugin names
2013-10-11 00:09:04 +02:00
Petr Škoda
a41d1ca0ce
MDL-41953 allow plugin names to end with multiple digits
2013-10-11 00:04:39 +02:00
Sam Hemelryk
4e9c0d4c72
MDL-41959 dock: fixed action duplication
2013-10-11 10:07:29 +13:00
David Monllao
e9af3ed361
MDL-42013 behat: I should (not)? see checking visibility
...
Only for non-Javascript tests. If the step
is named I should/should not see whatever
is makes sense that has to be visible.
2013-10-10 18:40:29 +08:00
Andrew Nicols
9f3f4a3c3f
MDL-34209 JavaScript: Tidy up dragdrop code.
2013-10-10 14:42:06 +08:00
Andrew Nicols
b57bc5855c
MDL-34209 JavaScript: Simplify section drag/drop to fix reordering issues
2013-10-10 14:42:06 +08:00
Damyon Wiese
835a006b07
Merge branch 'MDL-42091-master' of git://github.com/phalacee/moodle
2013-10-10 14:04:47 +08:00
Jason Fowler
97b251a352
MDL-42091 Atto - fixing on click indication
2013-10-10 13:47:10 +08:00
Damyon Wiese
370058d8fb
Merge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle
...
Conflicts:
lib/upgrade.txt
2013-10-10 10:49:11 +08:00
Damyon Wiese
80d5b253e2
Merge branch 'MDL-42091-master' of git://github.com/phalacee/moodle
2013-10-10 09:11:25 +08:00
Jason Fowler
8bcd5ddeab
MDL-42091 atto - fixing on hover and active states of buttons
2013-10-10 09:05:47 +08:00
Dan Poltawski
e077f21827
Merge branch 'wip-MDL-42020-master' of git://github.com/marinaglancy/moodle
2013-10-10 08:18:28 +08:00
Marina Glancy
bf1405a60a
MDL-42020 course: performance improvement in course listings
...
- better performance when get_course_count() OR search_course_count() are called by themselves
- better performance in displaying course contacts
2013-10-10 10:51:16 +11:00
Dan Poltawski
c08f914799
Merge branch '42057-26' of git://github.com/samhemelryk/moodle
2013-10-10 07:20:18 +08:00
Marina Glancy
9e4561b2f2
Merge branch 'MDL-41993-master-fix1' of git://github.com/damyon/moodle
2013-10-10 09:36:30 +11:00
Sam Chaffee
87a26cc402
MDL-42065 core_grade: Modified some grade_item queries for improved performance
...
* Modified 2 queries in grade_item::depends_on to improve performance
* Added additional unit tests to cover those queries better
2013-10-09 12:16:54 -06:00
Alain Corbière
11b4ad97f4
MDL-41672 Fix html2text processing of multiple occurrences of the same URL
2013-10-09 15:40:38 +02:00
David Mudrák
12cead32f2
MDL-41672 Add html2text unit test for multiple occurrences of the same URL
2013-10-09 15:38:21 +02:00
Dan Poltawski
54cd84c84b
Merge branch 'w41_MDL-42054_m26_phpmailertesting_i' of https://github.com/skodak/moodle
2013-10-09 18:16:56 +08:00
Petr Škoda
90930acff8
MDL-42054 fix incorrect email redirection in unit tests
2013-10-09 12:08:55 +02:00
Jerome Mouneyrac
b0ec47fb19
MDL-41604 Moodle should also fallback to the default theme when a parent theme is invalid.
2013-10-09 17:05:31 +08:00
Dan Poltawski
117111b78b
Merge branch 'MDL-39776-master' of git://github.com/phalacee/moodle
2013-10-09 16:54:02 +08:00
Dan Poltawski
07b0214588
Merge branch 'm26_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2013-10-09 16:46:56 +08:00
Dan Poltawski
bbe834a152
Merge branch 'MDL-41986-master' of git://github.com/andrewnicols/moodle
2013-10-09 16:28:53 +08:00
Dan Poltawski
c58b3ca0ca
Merge branch 'MDL-41985-master' of git://github.com/andrewnicols/moodle
2013-10-09 16:27:50 +08:00
Damyon Wiese
c2a2580ac9
Merge branch 'wip-MDL-40844-master' of git://github.com/abgreeve/moodle
2013-10-09 12:09:10 +08:00
Damyon Wiese
604fc45ee0
Merge branch 'wip-MDL-42098-master' of git://github.com/abgreeve/moodle
2013-10-09 11:48:14 +08:00
Jason Fowler
614119163f
MDL-39776 Javascript - enable formautosubmit from a select box on android
2013-10-09 11:36:13 +08:00
Damyon Wiese
103ba42d84
MDL-41993 Atto: Always clean/update the textarea when the content is changed
2013-10-09 11:08:06 +08:00
Sam Hemelryk
f18f96f767
Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle
...
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
2013-10-09 15:58:45 +13:00
Dan Poltawski
e9091a28f5
Merge branch 'wip-MDL-42089-master' of git://github.com/abgreeve/moodle
2013-10-09 10:54:24 +08:00
Dan Poltawski
9d841c6c90
Merge branch 'mdl41908-master' of https://github.com/tlock/moodle
2013-10-09 10:27:07 +08:00
Eloy Lafuente (stronk7)
7e9dadfd99
Merge branch 'MDL-42026-master' of git://github.com/damyon/moodle
...
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2013-10-09 01:48:45 +02:00
Eloy Lafuente (stronk7)
38c6dc4313
Merge branch 'wip-MDL-42068-m26-showshortnamefilepicker' of git://github.com/henesnarfel/moodle
2013-10-09 01:26:52 +02:00
Sam Hemelryk
08f95ac5e5
Merge branch 'w41_MDL-16073_m26_extdbtest_i' of https://github.com/skodak/moodle
2013-10-09 09:23:53 +13:00
Sam Hemelryk
9d1b909a9c
Merge branch 'MDL-41956_master' of https://github.com/totara/openbadges
2013-10-09 08:54:46 +13:00
Petr Škoda
6cf2091571
MDL-16073 add test for connection to external database for authentication and enrolments
2013-10-08 21:53:51 +02:00
Eloy Lafuente (stronk7)
cef0f4203b
Merge branch 'wip-MDL-42141-master' of git://github.com/marinaglancy/moodle
2013-10-08 21:23:56 +02:00
sam marshall
39e5102f8b
MDL-41838 Backup/restore: Support .tar.gz format for .mbz (2 of 2)
...
The new experimental setting enabletgzbackups allows backups to be
created so that the internal format for .mbz files is .tar.gz.
Restore transparently supports .mbz files with either internal
formats (.zip or .tar.gz).
The .tar.gz format has the following benefits for backup:
- Supports larger files (no limit on total size, 8GB on single file
vs. 4GB limit on total size)
- Compresses text better, resulting in smaller .mbz files.
- Reports progress regularly during compression of single files,
reducing the chance of timeouts during backups that include a
very large file.
Time performance may also be improved although I haven't done a
direct comparison.
2013-10-08 13:04:49 +01:00
sam marshall
c858655dde
MDL-41838 Files: Implement .tar.gz packer (1 of 2)
...
A new packer for .tar.gz files (MIME type application/x-gzip) has been
implemented, including unit tests.
This packer is intended for use during backup/restore only and is not
otherwise exposed in the user interface at present. However, it is
supposed to follow the (ancient) POSIX .tar standard; files created
with this packer will open in GNU tar.
There are restrictions in support corresponding to the POSIX standard:
- Non-ASCII filenames are not supported.
- Very long file/path names are not supported.
- Individual files within the .tar may not be more than 8GB.
Some of these limitations might need to be addressed in future changes
if the packer were to be used in areas other than backup/restore.
2013-10-08 13:04:48 +01:00
Eloy Lafuente (stronk7)
467fc03982
Merge branch 'w41_MDL-42199_m26_rev' of https://github.com/skodak/moodle
2013-10-08 10:53:03 +02:00
Dan Poltawski
4f0eaf18f4
Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle
...
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
2013-10-08 16:42:17 +08:00
Damyon Wiese
7bfc69b0c2
Merge branch 'MDL-40053-master' of git://github.com/ankitagarwal/moodle
2013-10-08 16:19:25 +08:00
Damyon Wiese
44585a1ecd
Merge branch 'MDL-41792_master' of https://github.com/markn86/moodle
2013-10-08 16:03:46 +08:00
Petr Škoda
307124bed8
MDL-42199 fix course revision test
2013-10-08 09:57:09 +02:00
Ankit Agarwal
c4f9401ce4
MDL-40053 events: Replace add_to_log() with new events in core_notes
2013-10-08 15:12:20 +08:00
Ankit Agarwal
3cc4cc68e4
MDL-40053 events: write events for core_notes
...
Following events were added in this commit :-
core\event\note_created
core\event\note_deleted
core\event\note_updated
core\event\notes_viewed
2013-10-08 15:12:20 +08:00
Damyon Wiese
18ef6201c0
Merge branch 'passwordreset-2013-10-07-1031Z' of https://github.com/peterbulmer/moodle
...
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
2013-10-08 10:30:57 +08:00
Sam Hemelryk
cbf34f34cc
Merge branch 'MDL-32188' of git://github.com/timhunt/moodle
...
Conflicts:
lib/db/upgrade.php
2013-10-08 14:43:36 +13:00