1387 Commits

Author SHA1 Message Date
Marina Glancy
9f973b7bae Merge branch 'master_MDL-43192' of https://github.com/danmarsden/moodle 2013-12-09 11:28:03 +11:00
Dan Marsden
8164a2b549 MDL-43192 Repository: param doesn't exist - should use function 2013-12-04 20:54:57 +13:00
Sam Hemelryk
4f13423663 Merge branch 'wip-mdl-40079' of git://github.com/rajeshtaneja/moodle 2013-12-04 09:49:29 +13:00
Rajesh Taneja
e6e5f43efc MDL-40079 repositories: Added deprecated tags 2013-12-03 13:34:33 +08:00
Rajesh Taneja
7f9a4b35c3 MDL-40079 repositories: Replaced const with configs for boxnet 2013-12-03 13:24:10 +08:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Rajesh Taneja
c1b3ac4358 MDL-40079 repositories: Replaced const with configs 2013-12-02 09:41:41 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Eloy Lafuente (stronk7)
201877b5d0 Merge branch 'MDL-42573-master' of git://github.com/danpoltawski/moodle 2013-11-12 03:27:22 +01:00
Dan Poltawski
7925c3b45c MDL-42666 repository_boxnet: fix broken version
The last commit here looked like Fred had broken the version,
but it was my mistake. I owe Fred a beer at the next available
opportunity.
2013-11-08 11:02:35 +08:00
Frederic Massart
ab1658fb17 MDL-42666 repository_boxnet: Do not run the upgrade multiple times 2013-11-07 15:53:59 +08:00
Frederic Massart
7cb353ff69 MDL-42666 tests: Setting new Box.net mandatory arguments 2013-11-07 13:54:47 +08:00
Dan Poltawski
f6a2a36bcd Merge branch 'MDL-42666-master' of git://github.com/FMCorz/moodle 2013-11-07 11:44:01 +08:00
Frederic Massart
f591c247ca MDL-42666 repository_boxnet: Improved output during migration 2013-11-07 10:58:40 +08:00
Frederic Massart
102a241998 MDL-42666 repository_boxnet: Fix undefined variable usage 2013-11-07 10:54:48 +08:00
Frederic Massart
d7274bfead MDL-42666 repository_boxnet: Convert all the references asap
This has been done in case the script fails during the processing
and needs to be re-run. Now all the references are converted as soon
as we can, where as before they could have ended up being re-downloaded.
2013-11-07 10:54:47 +08:00
Frederic Massart
ab227cc6a9 MDL-42666 repository_boxnet: Warn on HTTPS requirement when non HTTPS 2013-11-07 10:54:47 +08:00
Frederic Massart
090976b966 MDL-42666 repository_boxnet: Alert the admins of the migration process 2013-11-07 10:54:38 +08:00
Dan Poltawski
02c6bd358f Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle
Conflicts:
	lang/en/moodle.php
2013-11-07 09:34:31 +08: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
Damyon Wiese
ac3831b422 Merge branch 'MDL-41232-master' of git://github.com/mouneyrac/moodle 2013-11-06 11:59:41 +08:00
Frederic Massart
b2f9028559 MDL-42666 repository_boxnet: Remove hardcoded date for APIv1 end of life 2013-11-06 10:46:29 +08:00
Frederic Massart
091ac5969e MDL-42666 repository_boxnet: Disabling file references 2013-11-06 10:46:29 +08:00
Frederic Massart
05eaf64397 MDL-42666 repository_boxnet: Advise the user to run the migration tool 2013-11-06 10:46:29 +08:00
Frederic Massart
cc4de9ea58 MDL-42666 repository_boxnet: Tool to launch the migration 2013-11-06 10:46:29 +08:00
Frederic Massart
4cdb94cce7 MDL-42666 repository_boxnet: Function to convert APIv1 references to true copies 2013-11-06 10:46:29 +08:00
Frederic Massart
2d5c7d5057 MDL-42666 repository_boxnet: Convert repository to APIv2 2013-11-06 10:45:52 +08:00
Helen Foster
5a25566060 MDL-42728 Merge English strings from the en_fix language pack 2013-11-05 23:41:44 +01:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Frederic Massart
37b6c65dfe MDL-41807 repository_filesystem: Coding style clean up 2013-11-04 13:35:04 +08:00
Frederic Massart
5df695d221 MDL-41807 repository_filesystem: Prevent access to parent directories 2013-11-04 13:34:59 +08:00
Petr Škoda
0c431257e9 MDL-42387 standardise file lifetime handling 2013-11-01 10:42:18 +01:00
Jason Fowler
98719c48fa MDL-42236 Filepicker: fixing search box for repositories
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-01 08:55:27 +08:00
Jerome Mouneyrac
07d1a2f349 MDL-41232 revert IE8 fix for solving unspoken filemanager details on View List selection 2013-10-29 14:44:02 +08:00
Dan Poltawski
c4a8d8e4ca MDL-42573 skydrive: support non-js login scheme
This is actually not especially useful because Microsoft don't currently
support non-JS login. But its possible they could make it work in
future. And at least the user gets an error from MS rather than blank
screen.
2013-10-28 16:23:42 +08:00
Eloy Lafuente (stronk7)
20ddc0c9cf Merge branch 'MDL-42410-master' of git://github.com/danpoltawski/moodle 2013-10-24 23:35:24 +02:00
Dan Poltawski
93488d8bb0 Merge branch 'MDL-42293-master' of git://github.com/ankitagarwal/moodle 2013-10-24 10:27:23 +08:00
Andrew Davis
fa4fb78642 MDL-26244 mod_date:added some logic show or hide the file picker button based on repository availability 2013-10-21 08:49:38 +07:00
Ankit Agarwal
93fe4d2a11 MDL-42293 behat: Add suport for custom admin paths to the behat upload repository step 2013-10-21 09:29:16 +08:00
Dan Poltawski
05f597ecac MDL-42410 skydrive: Fix url to microsoft oauth site 2013-10-17 14:25:06 +08:00
Petr Škoda
b2858b916a MDL-42148 new overview of 3rd party libraries
Includes:
* each plugin has own thirdpartylibs.xml file
* added missing libraries
* fixed existing library infos
* new Site administration / Development / Third party libraries page
2013-10-16 14:48:29 +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
Marina Glancy
5e5923ea28 MDL-42016 repository: Implement new sync method in repositories 2013-10-06 18:05:13 +11:00
Marina Glancy
873555604f MDL-42016 repository: Simplify API to sync external files
Too many functions, too different parameters, unnecessary DB queries.
All repositories developed for Moodle 2.3-2.5 will continue to work.

Also get rid of DB field files_reference.lifetime, it is not used by
anybody except repository itself.
2013-10-06 18:05:09 +11:00
Marina Glancy
2a68ee0eb1 MDL-42016 files: Properly synchronise internal references 2013-10-06 18:05:05 +11:00
David Monllao
8b30d05557 MDL-42013 behat: Fixing related tests
We had no false positives because of this
issue, but some checking have been restricted
to specific DOM parts.
2013-10-04 14:38:11 +08:00
Marina Glancy
e2a61ee3db MDL-33416 files: Remove unused reference fields in files table
Fields files.referencelastsync and files.referencelifetime just waste the space and actually duplicate the fields
files_reference.lifetime and files_reference.lastsync
2013-09-27 16:50:08 +10:00
Sam Hemelryk
6eef32525e Merge branch 'MDL-41907' of https://github.com/merrill-oakland/moodle 2013-09-25 10:18:30 +12:00
Sam Hemelryk
a78e39e3d3 Merge branch 'master_MDL-41580' of git://github.com/danmarsden/moodle 2013-09-25 09:27:44 +12:00
Dan Marsden
361a47d409 MDL-41580 SCORM: allow imsmanifest.xml to be used in file system repos 2013-09-24 12:08:38 +12:00