mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 08:30:04 +01:00
Code Issues Projects Releases Wiki Activity
54,582 Commits 36 Branches 527 Tags
Commit Graph

2740 Commits

Author SHA1 Message Date
Sam Hemelryk
cc0823118d Merge branch 'wip-MDL-33931-master' of git://github.com/abgreeve/moodle 2012-06-22 14:25:54 +12:00
Sam Hemelryk
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
David Mudrák
7b5f67f77f MDL-33430 Notify user about file aliases failures at the final stage of the restore 2012-06-21 15:22:38 +02:00
Adrian Greeve
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
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
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
cd29a5822f Merge branch 'MDL-33722-master-wip' of git://git.luns.net.uk/moodle 2012-06-20 14:53:20 +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
Aparup Banerjee
900183ebf7 MDL-33357 theme : mymobile whitespace fixes 2012-06-20 12:49:20 +08: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
Aparup Banerjee
e77fe8f020 Merge branch 'MDL-33856-master-1' of git://git.luns.net.uk/moodle 2012-06-20 11:00:38 +08:00
John Stabinger
256c51fab0 MDL-33357 update mymobile inline for 2.3, attempt 3 2012-06-19 13:44:51 -04:00
Andrew Robert Nicols
61eadb51af MDL-33856 Correct CSS selectors for chooser dialogues in RTL languages 2012-06-19 10:32:32 +01:00
Dan Poltawski
5e3698fda0 Merge branch 'wip-MDL-33661-master' of https://github.com/barbararamiro/moodle 
Conflicts:
	theme/base/style/core.css
 2012-06-19 16:28:00 +08:00
Aparup Banerjee
9e4d54e15d Merge branch 'wip-MDL-33130-master' of https://github.com/barbararamiro/moodle 
Conflicts:
	theme/base/style/core.css
	theme/base/style/filemanager.css
 2012-06-19 16:09:43 +08:00
Martin Dougiamas
c23170914a MDL-33845 Removed the hideous amounts of whitespace around the folder edit view for canvas theme (and moved Folder CSS together) 2012-06-19 16:08:28 +08:00
Barbara Ramiro
af9c48cbe9 MDL-33130 Filemanager/Filepicker buttons, Activitity Chooser and Quiz revised to look consistent 2012-06-19 14:36:13 +08:00
Dan Poltawski
bb046e61b6 Merge branch 'wip-MDL-33423-m23' of git://github.com/samhemelryk/moodle 2012-06-19 14:29:25 +08:00
Aparup Banerjee
36080a2da2 MDL-30337 : removed extra css affecting LTR when it shouldn't. 2012-06-19 14:27:41 +08:00
Sam Hemelryk
9d7d2b03c8 MDL-33423 filepicker: Fixed visibility problem with loading icon 2012-06-19 16:53:44 +12:00
Marina Glancy
1778f310f3 MDL-33417 Show reference icon for files in filepicker 2012-06-19 11:15:51 +08:00
Andrew Robert Nicols
2de13ef252 MDL-33722 Set z-index for dndupload-status message to prevent it hiding other items 2012-06-18 11:35:58 +01:00
Dan Poltawski
3248a1e1e4 Merge branch 'MDL-33794' of git://github.com/stronk7/moodle 
Conflicts:
	mod/assign/version.php
 2012-06-18 16:08:39 +08:00
Aparup Banerjee
341d989d63 Merge branch 'MDL-30337_no_risk' of git://github.com/nebgor/moodle 2012-06-18 16:03:08 +08:00
Aparup Banerjee
751fe70671 MDL-30337 theme : cleanup after conflict. 2012-06-18 16:02:34 +08:00
Nadav Kavalerchik
6abbcf194e MDL - RTL Theme fixes for Moodle 2 (theme/canvas) 
Right align Forms in Report pages (when in RTL mode)
 2012-06-18 11:34:51 +08:00
Nadav Kavalerchik
409c12f21a MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base) 
Right align Fields in forms (when in RTL mode)

Conflicts:

	theme/base/style/course.css
 2012-06-18 11:31:33 +08:00
Nadav Kavalerchik
d180d19a83 MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base) 
Support for blocks columns switch when in rtl mode:
theme/base/layout/frontpage.php
theme/base/layout/general.php

Right align course completion checkbox to the right side of the activities and resources, when in RTL mode
theme/base/style/course.css

Right align DOCK bar, when in RTL mode
theme/base/style/dock.css

First-name and Last-name Initials (filter) bar (on every users list) letters spacing (usability issue, NOT RTL issue)
theme/base/style/core.css

Conflicts:

	theme/base/style/core.css
	theme/base/style/course.css
 2012-06-18 11:24:04 +08:00
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Mary Evans
642b1ca325 MDL-32479 theme_base: some RTL fixes for Moodle 2.3 2012-06-15 22:00:03 +01:00
Aparup Banerjee
cafc5ae9c3 MDL-30337 Themes : RTL fixes for filepicker and filemanager 2012-06-15 16:15:25 +08:00
Aparup Banerjee
a6c3aed35d Merge branch 'MDL-33317-master' of git://github.com/FMCorz/moodle 2012-06-15 14:54:10 +08:00
Aparup Banerjee
8db5df0c56 Merge branch 'MDL-33442-master-integration' of git://github.com/FMCorz/moodle 2012-06-14 21:29:45 +08:00
Aparup Banerjee
6971dcf7ec Merge branch 'wip-MDL-33596-m23' of git://github.com/samhemelryk/moodle 2012-06-14 21:09:55 +08:00
Frederic Massart
76055f5de4 MDL-33442 Course: actions bring you back where you came from 2012-06-14 17:07:57 +08:00
Dan Poltawski
4585e6ac98 Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle 2012-06-14 16:23:08 +08:00
Sam Hemelryk
778121751d Merge branch 'MDL-32767' of git://github.com/danpoltawski/moodle 2012-06-14 16:37:08 +12:00
Barbara Ramiro
64063bdbe2 MDL-33661 Aligned assignment 2.2 and its subtypes 2012-06-13 16:00:03 +08:00
Barbara Ramiro
ee0f34b514 MDL-33005 Drag and drop animation revised to play once only 2012-06-13 15:12:53 +08:00
Nadav Kavalerchik
25df8c4e48 MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base) 
Correctly align the filemanager-toolbar , .fp-repo-name , .fp-repo-area , .fp-list .fp-repo
.fp-vb-icons , .fp-vb-details , .fp-vb-tree (need more work!)
.fp-icon , .fp-filename
theme/base/style/core.css
theme/base/style/filemanager.css

Conflicts:
	resolved by taking out all non .dir-rtl lines as there were heavy changes to filemanager and filepicker.
	we can't afford changes or breakage to LTR at this point.

	theme/base/style/core.css
	theme/base/style/filemanager.css
 2012-06-13 14:44:43 +08:00
Nadav Kavalerchik
cbf4d2f3af MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base) 
Correctly align the fp-toolbar, fp-pathbar, fp-viewbar, header, fp-mkdir-dlg
Add rtl images to the YUI file-picker
theme/base/style/core.css

Conflicts:
resolution was simply sticking with .dir-rtl changes only as we are near release and .dirrtl is borked.

	theme/base/style/core.css
	theme/base/style/filemanager.css
 2012-06-13 14:22:00 +08:00
Nadav Kavalerchik
8c5bd0591b MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base) 
Right align NEW YUI3 overlay Activity/Resource Chooser
theme/base/style/core.css
 2012-06-13 13:55:33 +08:00
Marina Glancy
0b2bfbd1c6 MDL-33550 Correctly process situation when file reference source is missing 
- do not die with fatal error if source file in moodle internal repository is missing;
- moved code duplication for moodle repositories into class repository (functions send_file, get_reference_details, get_file_by_reference, get_file_reference);
- update file status after repository::sync_external_file so we know that it is missing (or not missing anymore). Do not run this function more than once for file within one request;
- display readable name for Private Files and Server files with the new format;
- display broken icon in filemanager if we know that source is missing, display information (for admin) where it was located before: see repository::get_reference_details() and extending classes;
- removed unnecessary queries in stored_file::sync_external_file();
- syncronize files before displaying it's size in mod_resource, do not query  directly
 2012-06-13 12:11:06 +08:00
Aparup Banerjee
039e110509 Merge branch 'MDL-33610' of git://github.com/danpoltawski/moodle 2012-06-13 01:59:33 +08:00
Dan Poltawski
19774b885d Merge branch 'MDL-33676' of git://github.com/danpoltawski/moodle 2012-06-12 18:36:08 +08:00
Eloy Lafuente (stronk7)
e47275fa0d Merge branch 'w24_MDL-33636_m23_yuislash' of git://github.com/skodak/moodle 2012-06-12 12:31:27 +02:00
Barbara Ramiro
59e807e800 MDL-33676 Activity chooser dialogue background set to transparent for IE 2012-06-12 18:30:22 +08:00
Petr Skoda
84e1e04418 MDL-33636 add more yui caching goodness 2012-06-12 10:13:01 +02:00