mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-09 02:12:22 +02:00
Code Issues Projects Releases Wiki Activity
54,541 Commits 36 Branches 530 Tags
Commit Graph

54541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
75c8a109e5 Merge branch 'MDL-33878' of git://github.com/netspotau/moodle-mod_assign 2012-06-21 15:21:13 +08:00
Dan Poltawski
22b0514e27 Merge branch 'MDL-33860' of git://github.com/netspotau/moodle-mod_assign 2012-06-21 14:56:07 +08:00
Damyon Wiese
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
Damyon Wiese
7056953a1c MDL-33860: Use get_string for All option in assignment grading table 2012-06-21 14:48:28 +08:00
Mary Evans
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
Dan Poltawski
334de6b691 Merge branch 'MDL-33877' of git://github.com/netspotau/moodle-mod_assign 2012-06-21 10:04:29 +08:00
Sam Hemelryk
5f17311f52 MDL-27675 mod_feedback: Fixed up white space 2012-06-21 11:40:38 +12:00
Sam Hemelryk
d2448b8bd2 Merge branch 'MDL-27675_master' of git://github.com/grabs/moodle 2012-06-21 11:25:07 +12:00
Sam Hemelryk
92e0842978 Merge branch 'MDL-33808' of git://github.com/danpoltawski/moodle 2012-06-21 10:19:05 +12:00
Sam Hemelryk
21cb669f36 Merge branch 'MDL-33845_folder_whitespace' of git://github.com/moodler/moodle 2012-06-21 10:01:49 +12:00
Sam Hemelryk
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
Aparup Banerjee
c575842ce9 Merge branch 'MDL-33683-master-2' of git://git.luns.net.uk/moodle 2012-06-20 19:36:22 +08:00
Dan Poltawski
5649520d9b Merge branch 'MDL-33891-master-1' of git://git.luns.net.uk/moodle 2012-06-20 17:43:47 +08:00
Andrew Robert Nicols
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
Andrew Robert Nicols
dfe15e0ef9 MDL-33891 Ensure that listen events are cancelled correctly when closing the dialogue 2012-06-20 10:18:19 +01:00
Aparup Banerjee
4c7d9eb5c2 Merge branch 'wip-MDL-33811-m23' of git://github.com/samhemelryk/moodle 2012-06-20 17:18:00 +08:00
Aparup Banerjee
01158d86c4 Merge branch 'wip-MDL-33715-m23' of git://github.com/samhemelryk/moodle 2012-06-20 16:57:51 +08:00
Dan Poltawski
73ec069e3b Merge branch 'wip-MDL-33832-master' of git://github.com/marinaglancy/moodle 2012-06-20 16:55:29 +08:00
Aparup Banerjee
c949723817 Merge branch 'wip-MDL-33825-m23' of git://github.com/samhemelryk/moodle 2012-06-20 16:50:54 +08:00
Dan Poltawski
e3c7845314 Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle 2012-06-20 16:38:13 +08:00
Andrew Davis
703ffaea05 MDL-27156 repositories: altered a check as the !empty() test on $PAGE->course was always failing for some reason 2012-06-20 15:17:12 +07:00
Marina Glancy
83d2700ec9 MDL-33832 Fixed filling of files.source field 
- also supress the error on unserialise (because people already may have broken files.source field)
- also display details about unparseable JSON error
- make source field look the same across repositories
 2012-06-20 16:09:37 +08:00
Aparup Banerjee
3262f547fc Merge branch 'MDL-33649-master-2' of git://git.luns.net.uk/moodle 2012-06-20 15:19:18 +08:00
Aparup Banerjee
cd29a5822f Merge branch 'MDL-33722-master-wip' of git://git.luns.net.uk/moodle 2012-06-20 14:53:20 +08:00
Aparup Banerjee
7189225b7a Merge branch 'MDL-33728-master-1' of git://git.luns.net.uk/moodle 2012-06-20 14:49:16 +08:00
Aparup Banerjee
f65d3d1d18 Merge branch 'MDL-33703-master-3' of git://git.luns.net.uk/moodle 2012-06-20 14:39:58 +08:00
Damyon Wiese
1f417de84a MDL-33877: Prevent duplicate records in grade items table after running assignment upgrade tool 
The cause was multiple calls to set_field on the same table. Changed to update_record.
 2012-06-20 14:33:33 +08:00
Aparup Banerjee
eca0371465 Merge branch 'MDL-33729-master-1' of git://git.luns.net.uk/moodle 2012-06-20 14:28:05 +08:00
Dan Poltawski
b1c43c3f64 Merge branch 'w25_MDL-33831_m23_glossestrict' of git://github.com/skodak/moodle 2012-06-20 13:57:26 +08:00
Dan Poltawski
a3086f3233 Merge branch 'MDL-33875' of git://github.com/stronk7/moodle 2012-06-20 13:45:49 +08:00
Dan Poltawski
6e471afe8b Merge branch 'wip-MDL-33417-master' of git://github.com/marinaglancy/moodle 2012-06-20 13:42:19 +08:00
Dan Poltawski
b19af5b41c Merge branch 'MDL-33862-master-1' of git://git.luns.net.uk/moodle 2012-06-20 13:22:42 +08:00
Damyon Wiese
14c46e24a9 MDL-33878: Assignment - prevent error when removing overridden flag in gradebook 
This error only occurs when there is a submission but no grade in the assignment
and the feedback comments plugin is enabled.
 2012-06-20 13:11:19 +08:00
Aparup Banerjee
900183ebf7 MDL-33357 theme : mymobile whitespace fixes 2012-06-20 12:49:20 +08:00
Andrew Davis
bc8da017b5 MDL-27156 repositories: altered filepicker.php so that users with the ability to ignore course file size restrictions are not incorrectly restricted 2012-06-20 11:27:31 +07:00
Aparup Banerjee
b2d1c67e2c MDL-33357 theme : mymobile whitespaces fixup 2012-06-20 12:11:28 +08:00
Aparup Banerjee
23099d5beb Merge branch 'MDL-33357-3' of git://github.com/epsd/moodle 2012-06-20 12:11:07 +08:00
Dan Poltawski
d8d2eebb44 Merge branch 'MDL-33773' of git://github.com/netspotau/moodle-mod_assign 2012-06-20 11:25:08 +08:00
Dan Poltawski
f14651b6b1 Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle 2012-06-20 11:17:01 +08:00
Aparup Banerjee
e77fe8f020 Merge branch 'MDL-33856-master-1' of git://git.luns.net.uk/moodle 2012-06-20 11:00:38 +08:00
Jason Fowler
e85b7e7865 MDL-32290 - Repositories - Fixing missing slash from the URL path 2012-06-20 10:41:58 +08:00
Eloy Lafuente (stronk7)
4388b63177 MDL-33875 delete category: fix E_STRICT reset() by ref. 2012-06-20 03:31:44 +02:00
Eloy Lafuente (stronk7)
7128d8fca2 MDL-32003 xmldb: Use action error for filemodified check instead of structure one (protected attr). 2012-06-20 02:04:02 +02:00
Eloy Lafuente (stronk7)
cb172822e5 Merge branch 'w25_MDL-32003_m23_dbcleanup' of git://github.com/skodak/moodle 2012-06-20 02:03:47 +02:00
Sam Hemelryk
f7dc4a5630 Merge branch 'MDL-3971' of git://github.com/danpoltawski/moodle 2012-06-20 11:39:59 +12:00
Sam Hemelryk
1e3d84785a Merge branch 'wip-mdl-33425' of git://github.com/rajeshtaneja/moodle 2012-06-20 11:32:04 +12:00
Sam Hemelryk
a9efc8ddb8 Merge branch 'MDL-32908' of git://github.com/danpoltawski/moodle 2012-06-20 10:31:52 +12:00
Sam Hemelryk
ec1ca38996 Merge branch 'MDL-33843' of git://github.com/netspotau/moodle-mod_assign 2012-06-20 09:36:22 +12:00
Sam Hemelryk
dae0c90dbd Merge branch 'wip-mdl-33506' of git://github.com/rajeshtaneja/moodle 2012-06-20 09:15:48 +12:00
John Stabinger
256c51fab0 MDL-33357 update mymobile inline for 2.3, attempt 3 2012-06-19 13:44:51 -04:00