31ea84a503
Merge branch 'MDL-32769-master' of git://github.com/ankitagarwal/moodle
2012-06-22 14:40:09 +12:00
cc0823118d
Merge branch 'wip-MDL-33931-master' of git://github.com/abgreeve/moodle
2012-06-22 14:25:54 +12:00
dd9247adfe
MDL-33954: Assignment "submissionreceipthtml" Language change
...
Add the missing word: "see"
2012-06-22 09:03:18 +08:00
0773a5161a
Automatically generated installer lang files
2012-06-22 00:31:21 +00:00
088c374a6d
Merge branch 'MDL-33430-reference-restore' of git://github.com/mudrd8mz/moodle
...
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
2012-06-22 11:56:49 +12:00
0e5533b607
MDL-32769 completion: Fixed up display of completion information
2012-06-22 10:42:56 +12:00
a273391e4a
Merge branch 'MDL-33936-master-1' of git://git.luns.net.uk/moodle
2012-06-22 09:47:13 +12:00
c691963939
Merge branch 'wip-MDL-33928-master' of git://github.com/phalacee/moodle
2012-06-22 09:33:25 +12:00
c5541daf00
Merge branch 'MDL-33915' of git://github.com/danpoltawski/moodle
2012-06-22 09:02:50 +12:00
7b5f67f77f
MDL-33430 Notify user about file aliases failures at the final stage of the restore
2012-06-21 15:22:38 +02:00
ff8734f21d
MDL-33430 Give tasks an access to their current plan's results
...
This in turn provides access to the plan's results for both structure and
execution steps so they can register something useful there.
2012-06-21 12:28:09 +02:00
fb3a57e2d4
MDL-33430 Fix strict standards warning
...
Only variables should be passed by reference.
2012-06-21 12:28:09 +02:00
5a322c8cfc
MDL-33381 Icon label removed for all file types to make it generic
2012-06-21 18:19:33 +08:00
d129c3608f
MDL-33430 Add caching into choose_repository() method
...
Simply do not repeat expensive search once the restore process decides how
to deal with the given repositoryid or repositorytype.
2012-06-21 12:17:54 +02:00
7cacb2ef08
Merge branch 'wip-MDL-33297-master' of git://github.com/abgreeve/moodle
2012-06-21 17:34:57 +08:00
a1b0852779
MDL-33419 Reference/source icons in table view and list view displayed and smaller
2012-06-21 17:13:43 +08:00
c397e0c8bc
MDL-33936 Detect activity chooser in block_site_main_menu correctly
2012-06-21 09:19:20 +01:00
dce49c1c38
MDL-32769 course: Moving the completion status to a new line
2012-06-21 16:16:48 +08:00
2a67e6f28b
MDL-33911 mathslib: add unit test to demonstrate problem
2012-06-21 16:00:45 +08:00
1e485acd7d
Merge branch 'MDL-33911' of git://github.com/timhunt/moodle
2012-06-21 16:00:08 +08:00
612aee17b0
MDL-33931 - themes - Change of the base theme to align the submit and cancel buttons with the rest of the mform (15%)
2012-06-21 15:47:02 +08:00
75c8a109e5
Merge branch 'MDL-33878' of git://github.com/netspotau/moodle-mod_assign
2012-06-21 15:21:13 +08:00
22b0514e27
Merge branch 'MDL-33860' of git://github.com/netspotau/moodle-mod_assign
2012-06-21 14:56:07 +08:00
caff10a0b0
MDL-33850: Assignment: Change text to "Add submission" before anything has been submitted
...
AMOS BEGIN
CPY [addsubmission,mod_assignment],[addsubmission,mod_assign]
AMOS END
2012-06-21 14:48:53 +08:00
7056953a1c
MDL-33860: Use get_string for All option in assignment grading table
2012-06-21 14:48:28 +08:00
68b8cc84af
MDL-32769 course: Do not show a completion status of 0/0
2012-06-21 13:29:46 +08:00
088511ded6
MDL-33785 theme_base: RTL fixes added to style/filemanager.css
...
Conflicts:
theme/base/style/filemanager.css
2012-06-21 17:24:07 +12:00
026082b401
MDL-33915 - prevent use of rebuild_course_cache during upgrade
...
It depends on upgrade changes itself
2012-06-21 11:43:54 +08:00
3d24b287be
MDL-33928 - Installation - Fixing the size of the host field for database details in the installation stage
2012-06-21 11:18:51 +08:00
7db6bb7f61
MDL-33717 files: improved display_size() so that it displays something nice for -1
2012-06-21 10:14:32 +07:00
334de6b691
Merge branch 'MDL-33877' of git://github.com/netspotau/moodle-mod_assign
2012-06-21 10:04:29 +08:00
2c1426743a
MDL-33430 Add process_file_aliases_queue restore step to the final task
...
This execution step tries to actually restore all aliases that were
stashed in the file aliases queue.
2012-06-21 02:31:26 +02:00
83b2cc562d
MDL-33430 Set newcontextid and newitemid when sending file to the pool
2012-06-21 02:31:18 +02:00
38ca2f1a83
MDL-33430 Add newcontextid and newitemid to backup_files_template
...
These new fields will be used to hold the new location of the file once
it is sent to the filepool during the restore.
2012-06-21 02:29:42 +02:00
4b6b087faf
MDL-33430 Do not restore aliases yet, stash them for later processing
2012-06-21 02:29:34 +02:00
5f17311f52
MDL-27675 mod_feedback: Fixed up white space
2012-06-21 11:40:38 +12:00
79b810fdc0
MDL-33430 Include repository type in files.xml in MBZ backup file
...
This is a valuable information needed especially when restoring the MBZ
at another site. The repositoryid itself is not enough there to identify
the type of the repository.
2012-06-21 01:32:25 +02:00
6feae1d256
MDL-33430 Make file_storage::unpack_reference() more picky on what it gets
2012-06-21 01:32:24 +02:00
d2448b8bd2
Merge branch 'MDL-27675_master' of git://github.com/grabs/moodle
2012-06-21 11:25:07 +12:00
92e0842978
Merge branch 'MDL-33808' of git://github.com/danpoltawski/moodle
2012-06-21 10:19:05 +12:00
21cb669f36
Merge branch 'MDL-33845_folder_whitespace' of git://github.com/moodler/moodle
2012-06-21 10:01:49 +12:00
45d011c896
Merge branch 'MDL-32479_master' of git://github.com/lazydaisy/moodle
...
Conflicts:
theme/base/style/core.css
2012-06-21 09:46:32 +12:00
4efc3d4096
MDL-33911 lib/evalmath: fix strict syntax notices
2012-06-20 13:48:37 +01:00
c575842ce9
Merge branch 'MDL-33683-master-2' of git://git.luns.net.uk/moodle
2012-06-20 19:36:22 +08:00
5649520d9b
Merge branch 'MDL-33891-master-1' of git://git.luns.net.uk/moodle
2012-06-20 17:43:47 +08:00
ae86017339
MDL-33683 Determine sectionid for activity chooser at display time
...
Rather than calculate the sectionid for the activity chooser on page load,
we do so when opening the chooser. This resolves issues where sections have
been moved without swapping all of the section IDs around.
2012-06-20 10:32:10 +01:00
dfe15e0ef9
MDL-33891 Ensure that listen events are cancelled correctly when closing the dialogue
2012-06-20 10:18:19 +01:00
4c7d9eb5c2
Merge branch 'wip-MDL-33811-m23' of git://github.com/samhemelryk/moodle
2012-06-20 17:18:00 +08:00
01158d86c4
Merge branch 'wip-MDL-33715-m23' of git://github.com/samhemelryk/moodle
2012-06-20 16:57:51 +08:00
73ec069e3b
Merge branch 'wip-MDL-33832-master' of git://github.com/marinaglancy/moodle
2012-06-20 16:55:29 +08:00
Sam Hemelryk