moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65806 commits 37 branches 540 tags 1.3 GiB
Commit graph

2282 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
f03671d87e Revert "MDL-43306 restore: fix grade item sortorder restoration" 
This reverts commit e238b2cb92.
 2013-12-19 02:13:05 +01:00
Dan Poltawski
eab9fa0ef1 Merge branch 'MDL-41198-master' of https://github.com/mr-russ/moodle 2013-12-18 14:40:18 +08:00
Russell Smith
ce2add5c90 MDL-41198 lib: Allow PHP to generate random seed on script start 
All mt_srand instances are removed to allow PHP to do the work.
 2013-12-18 16:45:33 +11:00
Eloy Lafuente (stronk7)
0fb4218dad Merge branch 'MDL-43306-master' of git://github.com/danpoltawski/moodle 2013-12-17 10:29:25 +01:00
Andrew Nicols
44b724c374 MDL-43232 JavaScript: Correct typo when cancelling the confirmcancel 2013-12-11 13:29:46 +08:00
Eloy Lafuente (stronk7)
ebc77165a4 Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle 2013-12-10 23:29:06 +01:00
Eloy Lafuente (stronk7)
438ee6ebdc Merge branch 'MDL-42815-master' of git://github.com/sammarshallou/moodle 2013-12-10 23:24:56 +01:00
Dan Poltawski
e238b2cb92 MDL-43306 restore: fix grade item sortorder restoration 
Previously, restore was blindly inserting the old sort order into the
database, causing duplicate sortorders which lead to unpredicatble
sorting results.

Now we will use the api function to add it after the original sortorder,
this means if a duplicate exists in the original location, this item
will appear after it.
 2013-12-10 12:32:36 +08:00
Sam Hemelryk
f9fb9826be NOBUG: rebuilt shifted files 2013-12-10 09:18:16 +13:00
Sam Hemelryk
8f2bd073aa Merge branch 'MDL-43253-master' of git://github.com/andrewnicols/moodle 2013-12-10 09:09:06 +13:00
Sam Hemelryk
437fd401f9 Merge branch 'MDL-43232-master' of git://github.com/andrewnicols/moodle 2013-12-10 09:06:54 +13:00
David Monllao
c1faf86bd1 MDL-42625 behat: Make behat pacient 
* When looking for texts inside the page or inside
  other containers we should wait until the elements
  are visible.
* Same when expanding tree nodes.
* Normalizing loops to spin() function using
  behat_base::TIMEOUT and behat_base::EXTENDED_TIMEOUT,
  leaving TIMEOUT for DOM load processes and
  EXTENDED_TIMEOUT for long processes that involves JS
  too.
* Add page load waits between actions that involves
  reloading the page.
 2013-12-09 11:08:42 +08:00
Andrew Nicols
6531d5a8ec MDL-43253 JavaScript: Migrate moodle-backup-backupselectall to use Shifter 2013-12-07 23:44:12 +08:00
David Monllao
d1e55a47be MDL-42625 behat: Step definitions + related changes in features 
In general aiming for compatibility with multiple browsers,
firefox, chrome and phantomjs to be more specific.

* Removing hardcoded waits
* Adding @_alert, @_switch_window and @_switch_frame tags,
  to label actions that different drivers have problems with.
* Adding missing @_files_upload and @_only_local tags to features that
  uploads files.
* Fixing a few wait for page ready what specified miliseconds.
* New methods to ensure elements (usual selectors), sections and editors
  are ready to interact with
* Changing the select an option implementation to deal with the different
  drivers implementations when listening to JS events.
 2013-12-06 13:10:24 +08:00
David Monllao
333db2e9b9 MDL-42625 behat: Editing .feature files 2013-12-06 12:13:39 +08:00
Andrew Nicols
078d8c6e70 MDL-43232 JavaSript: Migrate moodle-backup-confirmcancel to use Shifter 2013-12-06 08:35:47 +08:00
Sam Hemelryk
2a336e2a36 Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle 
Conflicts:
	backup/util/ui/base_moodleform.class.php
 2013-12-04 09:44:25 +13:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Petr Škoda
a377754770 MDL-41819 try to work around max_input_vars restriction 2013-12-02 08:29:08 +08:00
Damyon Wiese
df9b573d85 MDL-43065 Backup: Prevent any responsiveness in backup/restore forms 
Adding 'unresponsive' class to any moodle form will prevent the default
collapsing on screens < 1200px.
 2013-11-29 14:27:34 +08:00
Sam Hemelryk
417d6f51cc Merge branch 'MDL-42905-master' of git://github.com/sammarshallou/moodle 2013-11-19 14:37:28 +13:00
Eloy Lafuente (stronk7)
953b6e2b34 MDL-42929 backup: keep own version & release updated. 2013-11-17 02:32:43 +01:00
sam marshall
8f46e2a808 MDL-42905 Backup progress: Pointless line of code should be deleted 2013-11-15 12:44:34 +00:00
Frederic Massart
c7b3c10e3b MDL-42768 restore: Use sql_compare_text instead for text comparison 2013-11-13 14:46:30 +08:00
sam marshall
40e8f0260c MDL-42815 Backup/restore: Error saving files - log messages unhelpful 
This commit contains three changes in the three files:
1. A bug in the backup process meant that anything logged after a
   certain point did not appear in the on-screen display of the
   backup log, because the logger was serialised and deserialised
   but display code referred to the old version. Changed so that
   code retrieves new object.
2. Add more information to backup log when there is a missing file.
3. Add more information to restore log when there is a missing file
   (and remove existing code duplication of the current message).

The 'missing file' situation is one that generally shouldn't occur in
normal usage, but when it does happen, it is useful to have full
information about the file.
 2013-11-11 17:15:32 +00:00
sam marshall
db0f0097e8 MDL-42084 Unit tests: Remove unnecessary 'clear time limit change' lines 2013-11-06 16:40:04 +00:00
sam marshall
3ef7279f26 MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere 
Exceptions (places where set_time_limit is still left) are:

Third-party libraries:
  ADODB
  PHPMailer

Moodle core:
  PHPUnit - not relevant (CLI mode)
 2013-11-06 16:40:01 +00:00
sam marshall
6edd90ccab MDL-42084 Backup: Update time limit to avoid regression, use new class 2013-11-06 16:39:59 +00:00
Andrew Nicols
11f8ef10c0 MDL-42737 ActionMenu: Close the menu after selecting actions 2013-11-06 17:16:49 +08:00
David Monllao
047a8800f4 MDL-40975 course: Adapt behat tests to the new course editing interface 2013-11-06 11:41:00 +08:00
Dan Poltawski
8d81bd5d1e Merge branch 'MDL-42363-fix-redirect-issue' of git://github.com/dmonllao/moodle 2013-11-05 15:52:48 +08:00
David Monllao
622442765e MDL-42363 behat: Avoid random failure because of timing differences 2013-11-05 15:27:13 +08:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Dan Poltawski
dcc08e55b5 Merge branch 'MDL-42363_master' of git://github.com/dmonllao/moodle 2013-11-04 23:34:18 +08:00
Damyon Wiese
e45910aff3 Merge branch 'MDL-42489-master' of git://github.com/ankitagarwal/moodle 2013-11-04 13:17:15 +08:00
Damyon Wiese
3b4e5a83f4 Merge branch 'MDL-38734-master' of git://github.com/danpoltawski/moodle 2013-11-01 08:55:29 +08:00
David Monllao
905729bf33 MDL-42363 behat: Covering MDL-41817 testing 
Covering backup/restore without blocks
and with a single course section.
 2013-10-30 18:28:14 +08:00
Damyon Wiese
3a33578926 Merge branch 'wip-mdl-30812' of git://github.com/rajeshtaneja/moodle 2013-10-28 12:11:34 +08:00
Ankit Agarwal
932f54e996 MDL-42489 backup: use correct exception class in automated backups 2013-10-28 09:58:56 +08:00
Eloy Lafuente (stronk7)
27ee4c13a5 Merge branch 'MDL-42377_master' of https://github.com/markn86/moodle 2013-10-25 01:14:04 +02:00
Dan Poltawski
5ab04db356 Merge branch 'MDL-42388-master' of git://github.com/sammarshallou/moodle 2013-10-24 16:15:24 +08:00
Dan Poltawski
76dcc0ee21 Merge branch 'MDL-42389-master' of git://github.com/sammarshallou/moodle 2013-10-24 16:07:17 +08:00
Ankit Agarwal
f3218d15b0 MDL-42427 backup: Fix undefined errors during automated backups 2013-10-23 12:03:13 +08:00
Rajesh Taneja
0daadaaeaf MDL-34612 Restore: Gracefully handle empty file contenthash while restoring 2013-10-22 09:47:42 +08:00
Rajesh Taneja
62b6135c38 MDL-34612 Restore: Gracefully handle empty section title while restoring 2013-10-22 09:47:42 +08:00
Mark Nelson
4543bf2423 MDL-42377 backup: fixed incorrect debugging message 2013-10-21 11:54:39 +08:00
Mark Nelson
70f210c04f MDL-42201 backup: introduced new automatic backup state 2013-10-21 11:51:12 +08:00
sam marshall
b6cdb4d660 MDL-42389 Restore: Broken restore causes notice before exception 2013-10-18 12:00:56 +01:00
sam marshall
62182e89cf MDL-42388 Restore: Some warnings displayed with debugging() 2013-10-18 11:59:45 +01:00
Tony Levi
1b55bdb644 MDL-38734: Automated backup failure causing all course to fail 
Conflicts:
	backup/moodle2/backup_stepslib.php
 2013-10-18 15:07:35 +08:00