2444 Commits

Author SHA1 Message Date
Dan Poltawski
c36a2401ab weekly release 2.7dev 2013-12-05 15:09:50 +08:00
Dan Poltawski
9b37cd72a2 weekly release 2.7dev 2013-11-29 12:52:39 +08:00
Eloy Lafuente (stronk7)
f7434db109 weekly on-sync release 2.7dev 2013-11-21 19:33:52 +01:00
Ankit Agarwal
cc49a6f7eb MDL-42767 notes: Delete notes on a course delete 2013-11-19 16:32:19 +08:00
Eloy Lafuente (stronk7)
b58bc15af5 weekly back-to-dev release 2.7dev 2013-11-16 23:46:18 +01:00
Eloy Lafuente (stronk7)
2b10fa0433 Moodle release 2.6 2013-11-16 17:28:07 +01:00
Eloy Lafuente (stronk7)
5e6da548d7 Moodle release 2.6rc1 2013-11-15 13:21:41 +01:00
Eloy Lafuente (stronk7)
9524fc754d on-demand release 2.6beta+ 2013-11-15 11:18:00 +01:00
Damyon Wiese
d5c0f0453c Merge branch 'MDL-39923_master' of https://github.com/totara/openbadges
Conflicts:
	version.php
2013-11-11 10:17:07 +08:00
Frederic Massart
4bceea11be MDL-42772 upgrade: Force alternate fields in session user 2013-11-08 14:01:39 +08:00
Yuliya Bozhko
f5d17c14ea MDL-39923 badges: Send badge messages through internal messaging system 2013-11-07 14:49:27 +13:00
Petr Škoda
e0caccb410 MDL-42708 force mymobile uninstallation during upgrade 2013-11-06 20:04:58 +01:00
Dan Poltawski
d214057cad on-demand release 2.6beta+ 2013-11-06 20:26:48 +08:00
Damyon Wiese
c5ae81ca38 Merge branch 'wip-MDL-38228-master' of git://github.com/marinaglancy/moodle
Conflicts:
	version.php
2013-11-05 22:44:53 +08:00
Marina Glancy
47644f7d6a MDL-38228 upgrade: Rewrite and re-apply script that fixes corrupt course modules to sequence relation 2013-11-05 14:20:50 +11:00
Eloy Lafuente (stronk7)
6644b04666 MDL-42701 Bump main version to observe all deps 2013-11-05 02:37:19 +01:00
Jerome Mouneyrac
7c2efc115c MDL-40874 Retire MyMobile as a standard theme 2013-11-04 14:18:41 +11:00
Damyon Wiese
e9a20b4703 Merge branch 'wip-MDL-28463-master' of git://github.com/marinaglancy/moodle
Conflicts:
	version.php
2013-11-01 21:31:57 +08:00
Dan Poltawski
5386f0bbfe on-demand release 2.6beta+ 2013-11-01 15:49:16 +08:00
Marina Glancy
b4dba228a7 MDL-28463 conditionlib: use MUC for caching grades, reset when grades are changed 2013-11-01 16:48:50 +11:00
Sam Hemelryk
df2d3777cc Merge branch 'MDL-42542-master' of git://github.com/FMCorz/moodle
Conflicts:
	version.php
2013-11-01 08:55:21 +08:00
Eloy Lafuente (stronk7)
68291f2d57 on-demand release 2.6beta+ 2013-10-25 13:04:18 +02:00
Frederic Massart
fc203e28d6 MDL-42542 portfolio: Fix handlerfile in portfolio event handler 2013-10-25 16:00:51 +08:00
Dan Poltawski
012b0472c5 Merge branch '42299-26' of git://github.com/samhemelryk/moodle
Conflicts:
	version.php
2013-10-24 15:47:48 +08:00
Dan Poltawski
34fb3545ea on demand release 2.6beta+
Thanks to all who entered the competition to find the mistake in the
last commit. It was spotted by none other than super-awesome Moodler
Justin Filip.

He collects a beer from me at our next available meeting.
2013-10-22 23:05:02 +08:00
Dan Poltawski
129ceb5849 on demand release 2.5beta+ 2013-10-22 20:52:44 +08:00
Dan Poltawski
3481222e57 MDL-42459 upgrade: fix upgrade step ordering
Also incremented version to be safe
2013-10-22 12:14:40 +02:00
Eloy Lafuente (stronk7)
bf928b2933 Merge branch 'MDL-42459-master' of git://github.com/damyon/moodle
Conflicts:
	version.php
2013-10-22 12:14:29 +02:00
Damyon Wiese
775a32c9b8 MDL-42459 Atto: Bye bye - see you in the plugins db! 2013-10-22 12:01:56 +08:00
Mark Nelson
70f210c04f MDL-42201 backup: introduced new automatic backup state 2013-10-21 11:51:12 +08:00
Dan Poltawski
4e47920f08 Moodle release 2.6beta 2013-10-18 16:21:45 +08:00
Sam Hemelryk
df460b5a23 MDL-42299 course: management category expansion improvements 2013-10-17 12:11:31 +13:00
Damyon Wiese
ef2b0f5ca3 MDL-42152 Javascript: Add version bump for YUI update 2013-10-15 10:55:29 +08:00
Eloy Lafuente (stronk7)
f8eff10319 weekly release 2.6dev 2013-10-11 13:20:42 +02: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
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
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
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
Matteo Scaramuccia
fd43a49b72 MDL-40226 Files: Added the correct MIME Type for JNLP files.
JNLP stands for Java Network Launch Protocol, used to launch
Java Web Start applications. More details in:
http://docs.oracle.com/javase/tutorial/deployment/webstart/deploying.html
2013-10-06 16:22:34 +02: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
Tim Hunt
4e3d829350 MDL-42105 questions: let attempts have a max fraction > 1.
This parallels question_attempt->minfraction, which allows the
fractional mark to go below zere.

This is needed to allow the certainty-base marking behaviours to work
better.
2013-10-04 17:52:19 +01:00
Peter Bulmer
92de749fc7 MDL-23692 forgotpw: Simplify forgotpw process. 2013-10-04 22:37:56 +13:00
Juan Leyva
e10df76f49 MDL-41914 New table user_devices 2013-10-04 11:36:04 +02:00
Sam Hemelryk
56cc9b387e weekly release 2.6dev 2013-10-04 15:43:58 +13:00
Damyon Wiese
3d27180e94 MDL-40493 User preference: Allow users to set their preferred text editor.
This changes the setting htmleditor in the user table from a 0 or 1 column
to a user preference for the name of their preferred html editor.
2013-10-02 12:49:30 +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
Marina Glancy
d45e65ccad weekly release 2.6dev 2013-09-27 14:23:44 +10:00
Eloy Lafuente (stronk7)
5f7aa1e2e9 MDL-41726 bump to force site/phpunit/behat reinstall 2013-09-25 01:26:54 +02:00
Petr Škoda
bde002b81a MDL-41437 rework plugin_manager caching and version info in blocks and modules
This patch includes:

* version column removed from modules table, now using standard config, this allows decimal version for modules
* version column removed from block table, now using standard config, this allows decimal version for blocks
* module version.php can safely use $plugins instead of module
* new plugin_manager bulk caching, this should help with MUC performance when logged in as admin
* all missing plugins are now in plugin overview (previously only blocks and modules)
* simplified code and improved coding style
* reworked plugin_manager unit tests - now using real plugins instead of mocks
* unit tests now fail if any plugin does not contain proper version.php file
* allow uninstall of deleted filters
2013-09-22 21:25:26 +02:00