Aparup Banerjee
575776c1bd
Merge branch 'MDL-31863' of git://github.com/mouneyrac/moodle
2012-06-12 11:09:51 +08:00
Marina Glancy
c0e8f211d3
MDL-33452 It must not possible to create an alias to another alias
...
- if the downloaded file is an alias we pretend that we operate with its source
2012-06-12 11:03:54 +08:00
Marina Glancy
c469b3963b
MDL-33446 Editor form field can filter return types
...
- Added possibility for editor form field to specify return_types (default FILE_INTERNAL | FILE_EXTERNAL | FILE_REFERENCE)
- For assignment, workshop, quiz essay submissions and form posts do not allow FILE_REFERENCE
- Fixed mod_resource return_types, reset them to default, because filemanager does not know how to work with FILE_EXTERNAL links
2012-06-12 11:03:43 +08:00
Eloy Lafuente (stronk7)
f8dfdb524b
on-demand release 2.3dev
2012-06-12 03:01:04 +02:00
Eloy Lafuente (stronk7)
92b0d9820e
Merge branch 'install_master' of git://github.com/amosbot/moodle
2012-06-12 02:55:03 +02:00
Eloy Lafuente (stronk7)
daf28d868b
MDL-32117 equella: make it core plugin
2012-06-12 02:37:04 +02:00
Eloy Lafuente (stronk7)
74ea1b95f4
MDL-32117 equella: add missing MOODLE_INTERNAL + phpdocs tidy
2012-06-12 02:23:14 +02:00
Eloy Lafuente (stronk7)
37b8257de5
Merge branch 'equella' of git://github.com/danpoltawski/moodle
2012-06-12 02:22:26 +02:00
Andrew Robert Nicols
0080872fc4
MDL-33608 Correct modulename_link for the label module
2012-06-11 12:41:25 +01:00
Barbara Ramiro
d76dfe97dd
MDL-33005 Replaced drag and drop arrow with animated gif
2012-06-11 19:37:33 +08:00
Barbara Ramiro
398c04dc59
MDL-33156 Customized 16px icons and generic image icons
2012-06-11 16:28:54 +08:00
Jerome Mouneyrac
ecd1bdf420
MDL-31863 fix responseerror when no files are found
2012-06-11 14:12:00 +08:00
Aparup Banerjee
fef6b15ad9
MDL-31863 Web Service : get_files() optional $modified timestamp returns files changed after given time.
2012-06-11 14:06:56 +08:00
Yang Yang
8f3039576a
MDL-31863 Web service : added modified to parameters and modifiedtime to description
2012-06-11 14:06:46 +08:00
Aparup Banerjee
42fd396171
Merge branch 'MDL-33548' of git://github.com/timhunt/moodle
2012-06-11 13:55:20 +08:00
Aparup Banerjee
6b8b0b2e68
MDL-34400 Libraries : maintained naming rule by removing stray mod_ function and class prefixes from activity modules.
...
This rule @ http://docs.moodle.org/dev/Activity_modules still stands for now.
2012-06-11 13:34:47 +08:00
Tim Hunt
33d7737711
MDL-33610 theme - increase activity icon spacing
2012-06-11 12:21:13 +08:00
Eloy Lafuente (stronk7)
3ea1330949
MDL-33455 restore: process grade_grades only if user matches.
...
Note this has been applied both to individual activities grade_grades
and to general ones.
2012-06-11 11:30:20 +08:00
Dan Poltawski
d66e5720a1
MDL-32117 - equella: prevent errors when no username
2012-06-11 10:08:16 +08:00
Christopher Tombleson
01b5936cd0
MDL-32937 Add drag and drop support to SCORM
2012-06-11 12:18:32 +12:00
Petr Skoda
8d475fe4fe
MDL-33543 fix mod_data E_STRICT issue when adding fields with file size limits
2012-06-10 10:05:59 +02:00
Eloy Lafuente (stronk7)
f0852f474b
MDL-33630 backup: invalidate ids cache on temptable drop.
2012-06-10 04:57:40 +02:00
AMOS bot
73da957671
Automatically generated installer lang files
2012-06-09 00:31:15 +00:00
Eloy Lafuente (stronk7)
fcbf68fd05
Merge branch 'w23_MDL-33595_m23_phpunitinit' of git://github.com/skodak/moodle
2012-06-08 19:32:26 +02:00
Eloy Lafuente (stronk7)
997c7e2744
Merge branch 'MDL-33471' of git://github.com/timhunt/moodle
2012-06-08 17:08:18 +02:00
Tim Hunt
815fcecc40
MDL-33471 quiz cron: better mtrace output for overdue handling
2012-06-08 16:02:01 +01:00
Tim Hunt
4c7f377d9b
MDL-33612 quiz: Improve page title 'Editing quiz'
...
Include the quiz name in the title. Also, add two missing format_string
calls around $quiz->name.
2012-06-08 11:47:03 +01:00
Petr Skoda
7cb76d1645
MDL-33595 fix recent initial PHPUnit init regression
2012-06-08 11:50:03 +02:00
Eloy Lafuente (stronk7)
78117cb1a4
MDL-33465 fix incorrect merge conflict resolution
2012-06-08 10:55:39 +02:00
Dan Marsden
e099166635
MDL-33515 SCORM - attempts grading setting is confusing - last attempt is really last completed attempt.
2012-06-08 20:33:38 +12:00
Dan Poltawski
ec3d3ede80
MDL-33465 - bump version number for new log entry defintion
2012-06-08 15:54:31 +08:00
Dan Poltawski
4e020fe71d
Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle
2012-06-08 15:51:41 +08:00
Ankit Agarwal
283ba570c0
MDL-33465 course: COALESCE is not cross-db compatible while using fields of different datatypes
2012-06-08 15:48:18 +08:00
Dan Poltawski
dcac0787b9
Revert "MDL-31863 Web service : added modified to parameters and modifiedtime to description"
...
This reverts commit 25ccaf5494
.
2012-06-08 15:25:40 +08:00
Dan Poltawski
c13dcf934e
Revert "MDL-31863 Web Service : get_files() optional $modified timestamp returns files changed after given time."
...
This reverts commit 130d3fbf96
.
2012-06-08 15:25:34 +08:00
Dan Poltawski
c9d7e6fa16
Merge branch 'MDL-33498' of git://github.com/netspotau/moodle-mod_assign
2012-06-08 13:39:17 +08:00
Jason Fowler
d508e71d4c
MDL-33594 - Glossary - fixing portfolio exports
2012-06-08 13:32:44 +08:00
Dan Poltawski
b63084a58b
MDL-33594 mod_data: use filelib rather than speciifc internal file
2012-06-08 13:31:31 +08:00
Dan Poltawski
8ac226d23c
Merge branch 'MDL-33587-delete-alias' of git://github.com/mudrd8mz/moodle
2012-06-08 11:40:56 +08:00
Dan Poltawski
e13388c1c0
MDL-32783 quiz overdue handling: improve lang string
...
And remove a stray #
2012-06-08 10:47:31 +08:00
Dan Poltawski
583c698ee1
Merge branch 'MDL-32783' of git://github.com/timhunt/moodle
2012-06-08 10:36:17 +08:00
Dan Poltawski
3970a4719c
MDL-33593 course: rename editingenabled param
...
Change to notifyeditingon to better reflect what it does and
prevent people getting confused with edit=1
2012-06-08 10:21:58 +08:00
Eloy Lafuente (stronk7)
61aaad4833
Merge branch 'w23_MDL-33583_m23_keepall' of git://github.com/skodak/moodle
2012-06-08 01:56:06 +02:00
Sam Hemelryk
c224cc643b
Merge branch 'w23_MDL-33557_m23_initpath' of git://github.com/skodak/moodle
2012-06-08 11:53:43 +12:00
Eloy Lafuente (stronk7)
a3974b0106
Merge branch 'w23_MDL-30725_m23_backuptrash' of git://github.com/skodak/moodle
2012-06-08 01:43:40 +02:00
Sam Hemelryk
76cc4fd177
Merge branch 'MDL-33080' of git://github.com/stronk7/moodle
2012-06-08 10:23:16 +12:00
Sam Hemelryk
5874cc6aab
Merge branch 'MDL-32325-master' of git://github.com/FMCorz/moodle
2012-06-08 10:20:43 +12:00
Eloy Lafuente (stronk7)
03a94794fc
Merge branch 'MDL-32985_integration' of git://github.com/merrill-oakland/moodle
2012-06-08 00:04:19 +02:00
Sam Hemelryk
a15e8b4101
MDL-30506 navigation: Fixed up reference handling issue and added docs post integration
2012-06-08 09:34:19 +12:00
Sam Hemelryk
a509cb29c3
Merge branch 'MDL-30506' of git://github.com/jonof/moodle
2012-06-08 09:04:46 +12:00