64317 Commits

Author SHA1 Message Date
Petr Škoda
f007e89961 MDL-42224 clean up message and email redirection testing 2013-10-12 13:59:07 +02:00
Eloy Lafuente (stronk7)
f8eff10319 weekly release 2.6dev 2013-10-11 13:20:42 +02:00
Eloy Lafuente (stronk7)
88b6721ba1 NOBUG: Fixed file access permissions 2013-10-11 13:20:42 +02:00
Damyon Wiese
e4fc57eca5 Merge branch 'MDL-41792_intmaster' of https://github.com/markn86/moodle 2013-10-11 16:33:17 +08:00
Mark Nelson
1032966cee MDL-41792 core_calendar: fixed issues when using multiple calendar types
1) No longer assume that the end of the current month in Gregorian will be
the end of the month for the calendar type being used.
2) Need to take into account the hours and minutes a calendar type may vary
in order to generate timestamps.
3) When generating the previous and next month links start at the beginning
of the month, not the current day.
4) Need to convert to Gregorian when creating timestamps during calendar
exports.
2013-10-11 16:28:04 +08:00
Damyon Wiese
d61c05ac4a MDL-31830 category management: Fix coding_error when moving 0 courses 2013-10-11 16:06:40 +08:00
Marina Glancy
1b7930fe4a Merge branch 'wip-MDL-42238-master' of git://github.com/abgreeve/moodle 2013-10-11 13:32:14 +11:00
Sam Hemelryk
5624b054d4 MDL-42072 badges: fixed cookie use 2013-10-11 13:49:02 +13:00
Eloy Lafuente (stronk7)
3ed255dc1a Merge branch 'MDL-41604-master-5' of git://github.com/mouneyrac/moodle 2013-10-11 01:33:21 +02:00
Eloy Lafuente (stronk7)
4d4396c3b8 Merge branch 'w41_MDL-41953_m26_componentnumbers' of https://github.com/skodak/moodle 2013-10-11 00:47:30 +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
David Monllao
89376590c0 MDL-42013 behat: Uncommenting @core_files test 2013-10-10 18:40:29 +08: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
Adrian Greeve
60e34a02db MDL-42238 - mod_quiz: Slight change to the logic to fix Alt. name messages. 2013-10-10 14:06:33 +08:00
Adrian Greeve
60f55a2f72 MDL-42238 - Groups: Alternate name sql update to groups_get_potential_members(). 2013-10-10 14:05:53 +08:00
Damyon Wiese
835a006b07 Merge branch 'MDL-42091-master' of git://github.com/phalacee/moodle 2013-10-10 14:04:47 +08:00
Adrian Greeve
6d3d9bd927 MDL-42238 - mod_wiki: Alternate name sql update to wiki_print_recent_activity 2013-10-10 14:02:32 +08:00
Adrian Greeve
dda60f88cd MDL-42238 - mod_forum: Alternate name sql update to forum_print_recent_activity. 2013-10-10 14:02:23 +08:00
Jason Fowler
97b251a352 MDL-42091 Atto - fixing on click indication 2013-10-10 13:47:10 +08:00
Damyon Wiese
4aac948f34 MDL-41838 Backup: Fix undefined variable
Nice spotting Ankit!
2013-10-10 12:11:18 +08:00
Damyon Wiese
26d78116c0 MDL-42039 Backup: Fix whitespace 2013-10-10 11:25:51 +08:00
Damyon Wiese
982482f01a Merge branch 'MDL-42039-master' of git://github.com/sammarshallou/moodle.git 2013-10-10 11:11:16 +08:00
Sam Hemelryk
28fef14840 Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle 2013-10-10 16:06:40 +13:00
sam marshall
93eddacc61 MDL-42039 Restore: Add progress tracking while creating question files
If a backup contains a large number of questions, the
create_question_files function can take a very long time. This
change adds progress reporting during that function.
2013-10-10 10:57:31 +08:00
sam marshall
0e2637054f MDL-42039 Restore: Add progress tracking while creating users
When restoring a backup that contains a large number of users
to a different server where those users don't already exist,
creating users can take a significant time. This change adds
progress reporting so that it doesn't time out and shows
activity in the user interface while doing the creation.
2013-10-10 10:57:31 +08:00
sam marshall
bf2a039e9a MDL-42039 Restore: Add progress tracking in restore controller load
In the case of a very large backup with many activities, simply loading
the restore controller (specifically, building the plan) can take a long
time and cause timeouts. This change adds progress reporting while the
restore controller is being loaded.

(This also reduces the time between first going to the page, and the
progress bar appearing, making a slightly better user experience.)

Conflicts:

	backup/restore.php
2013-10-10 10:57:24 +08:00
sam marshall
a658b73cd0 MDL-42039 Restore: Avoid unnecessary archive file copy at start
Change the start of restore process so that the archive file can
be passed as a pathnamehash pointing to the Moodle file object,
rather than only as a filename in the temporary directory. This
avoids making an unnecessary copy of the archive file, which can
take a long time (and potentially cause a timeout) in the case
of multi-gigabyte backups.
2013-10-10 10:56:30 +08:00
sam marshall
1cd39657b5 MDL-42039 Restore: Add progress reporting to directory deletion
Deleting directories at the end of backup can take a long time if
there are many directories (potentially up to 65536 file
directories). This change reports progress while deleting
directories to avoid timeout.
2013-10-10 10:56:30 +08:00
sam marshall
37ff843d7d MDL-42039 Restore: Add progress reporting between files in resource
When a resource contains a very large number of (presumably small)
files, we should display progress between each file so that it
doesn't time out.
2013-10-10 10:56:30 +08:00
Eric Merrill
53d79266b9 MDL-41940 files Additional behat cleanup
Fixing components and Given/When/Then styling.
2013-10-09 22:56:29 -04:00
sam marshall
02da69214f MDL-42039 Restore: Prevent adding too many form fields at once
This change relates to the Moodle forms used to select activities
in the restore process.

If you add too many form fields at once, it takes a very long time
during which we can't report progress. But adding fields in smaller
groups takes longer overall, so it's a tough balance. This change
splits the adds into groups of 1,000, reporting progress between each.
2013-10-10 10:56:29 +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
Dan Poltawski
00ae230f52 Merge branch 'MDL-41379_outcomes' of https://github.com/andyjdavis/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-10-10 10:31:44 +08:00
Marina Glancy
0965a9be10 Merge branch 'MDL-37153_master' of https://github.com/pauln/moodle 2013-10-10 12:52:28 +11:00
Sam Hemelryk
c80ef689d5 Merge branch 'wip-mdl-41744' of https://github.com/rajeshtaneja/moodle 2013-10-10 14:40:02 +13:00
Damyon Wiese
f0ae8d7a66 Merge branch 'MDL-38196-master' of git://github.com/sammarshallou/moodle
Conflicts:
	backup/backup.php
	theme/bootstrapbase/style/moodle.css
2013-10-10 09:31:33 +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
Marina Glancy
44cd0b03af Merge branch 'wip-mdl-38155' of git://github.com/rajeshtaneja/moodle 2013-10-10 11:23:06 +11: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
9c5d6183d5 Merge branch 'MDL-42143-master' of git://github.com/danpoltawski/moodle 2013-10-10 11:12:35 +11: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 Hemelryk
2dc15b1011 Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle 2013-10-10 08:37:03 +13:00
Sam Hemelryk
2219f50a10 Merge branch 'MDL-32188' of git://github.com/timhunt/moodle 2013-10-10 08:34:11 +13:00
Eric Merrill
ff715cc936 MDL-41940 files Fixes for behat tests
Commented out second test pending MDL-42013 visibiliy checking.
2013-10-09 07:47:11 -04: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