mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-27 02:53:29 +01:00
Code Issues Projects Releases Wiki Activity
54,373 Commits 36 Branches 527 Tags
Commit Graph

2704 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02: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
ee0f34b514 MDL-33005 Drag and drop animation revised to play once only 2012-06-13 15:12:53 +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
Dan Poltawski
f3e526b859 Merge branch 'wip-MDL-33005-master' of https://github.com/barbararamiro/moodle 2012-06-12 13:54:10 +08:00
Dan Poltawski
d87debaa3e MDL-32767 - course: Add a summary of activities 
When in single-page summary mode
 2012-06-12 13:13:52 +08:00
Sam Hemelryk
b305d623a5 MDL-33596 css_optimiser: Added an option for themes to disable the CSS optimiser 2012-06-12 14:23:15 +12:00
Barbara Ramiro
d76dfe97dd MDL-33005 Replaced drag and drop arrow with animated gif 2012-06-11 19:37:33 +08:00
Frederic Massart
4988b54667 MDL-33317 Theme: added jQuery noConflict to myMobile 2012-06-11 14:54:54 +08:00
Tim Hunt
33d7737711 MDL-33610 theme - increase activity icon spacing 2012-06-11 12:21:13 +08:00
Barbara Ramiro
8d25aeb711 MDL-33482 Replaced modchooser with chooserdialouge and cleaned codes 2012-06-07 18:09:14 +08:00
Andrew Robert Nicols
255dd8d1e2 MDL-33482 Replaced modchooser with chooserdialogue 2012-06-07 18:09:14 +08:00
Barbara Ramiro
89e00e91cd MDL-33482 Activity Chooser styled similar to Filepicker particularly the look and feel with drop shadow 2012-06-07 18:09:14 +08:00
Kordan
9ad11a6c70 MDL-32905 theme_formal_white: changed three setting name, some string name and string content 
AMOS BEGIN
 MOV [displaylogodesc,theme_formal_white],[headercontentdesc,theme_formal_white]
 MOV [frontpagelogo,theme_formal_white],[frontpagelogourl,theme_formal_white]
 MOV [frontpagelogodesc,theme_formal_white],[frontpagelogourldesc,theme_formal_white]
 MOV [heading,theme_formal_white],[displayheading,theme_formal_white]
 MOV [logo,theme_formal_white],[customlogourl,theme_formal_white]
 MOV [logodesc,theme_formal_white],[customlogourldesc,theme_formal_white]
 CPY [moodlelogo,theme_formal_white],[displaylogo,theme_formal_white]
AMOS END
 2012-06-06 10:02:39 +12:00
Sam Hemelryk
b576a97554 Merge branch 'MDL-33031_master' of git://github.com/kordan/moodle 2012-06-06 08:54:38 +12:00
Sam Hemelryk
5deaa764ba Merge branch 'MDL-33056_dnd_status_bar' of git://github.com/davosmith/moodle 2012-06-06 08:30:02 +12:00
Dan Poltawski
1cf840074b Merge branch 'wip-MDL-33218-master' of git://github.com/barbararamiro/moodle 2012-06-04 17:13:35 +08:00
Davo Smith
6c0ae99b69 MDL-33056 Course dnd upload - improved status box styling and added fade in/out 2012-06-01 11:27:42 +01:00
Barbara Ramiro
7c3e665289 MDL-33218 Filepicker repository and toolbar aligned for IE 2012-05-30 13:56:34 +08:00
Dan Poltawski
d079d6d8c1 Merge branch 'MDL-33110_master' of git://github.com/lazydaisy/moodle 2012-05-28 14:54:23 +08:00
Sam Hemelryk
a2aba3f612 Merge branch 'w21_MDL-18763_m23_avatar512' of git://github.com/skodak/moodle 2012-05-28 16:50:46 +12:00
Marina Glancy
5e11746696 MDL-33218 fixing filemanager/filepicker look in IE 
now all YUI dialogues are under the div with id #filesskin. This way we can avoid using !important in CSS and use #filesskin instead. It will have priority over YUI skin in all browswers including IE (!important does not work in IE).

Conflicts:

	files/renderer.php
	theme/base/style/filemanager.css
 2012-05-28 11:54:33 +08:00
Barbara Ramiro
6077e3813c MDL-33218 Filemanager and Filepicker IE issue 2012-05-28 11:44:51 +08:00
Sam Hemelryk
bb0eaec490 Merge branch 'MDL-32879' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/magazine/config.php
 2012-05-28 14:49:12 +12:00
Sam Hemelryk
d9ce6f6442 Merge branch 'MDL-32380_master' of git://github.com/kordan/moodle 2012-05-28 14:03:20 +12:00
Sam Hemelryk
08e0aaa173 Merge branch 'MDL-33191' of git://github.com/lazydaisy/moodle 2012-05-28 11:22:12 +12:00
Dan Poltawski
494573dc43 Merge branch 'MDL-32339-css-updates' of git://github.com/mudrd8mz/moodle 2012-05-25 10:13:19 +08:00
David Mudrak
5536f2fccf MDL-32339 improving the layout for narrow screens 2012-05-24 11:49:36 +02:00
Dan Poltawski
77cb9b6ce6 Merge branch 'wip-MDL-33162-master' of git://github.com/barbararamiro/moodle 2012-05-24 16:10:06 +08:00
Barbara Ramiro
a9352f1f3c MDL-33162, MDL-33183, MDL-33150 Adjusted styles filemanager, file picker and file picker form element 
- MDL-33162 Vertical align text to the middle of 24px icon for table view and tree view both on filemanager and filepicker
- MDL-33183 Layout file picker on form element on edit profile for drag and drop with dashed border and animated arrow consistent with filemanager (outputrenderers.php)
- MDL-33150 Added more space in between tool buttons both for file manager and filepicker
 2012-05-24 15:02:52 +08:00
Dan Poltawski
20005a0ed8 Merge branch 'wip-MDL-33152-master' of git://github.com/abgreeve/moodle 2012-05-24 14:39:58 +08:00
Mary Evans
5f73d19ddd MDL-33191 theme_magazine: changes to magazine/config.php fixes $THEME->layouts for Base & Standard 2012-05-22 16:54:00 +01:00
Adrian Greeve
f5d0c2a69f MDL-33152 - themes - Moved the action buttons more to the right, inline with the rest of the form. 2012-05-22 12:51:48 +08:00
Dan Poltawski
c1e1560843 Merge branch 'wip-mdl-33027' of git://github.com/rajeshtaneja/moodle 2012-05-22 11:54:30 +08:00
Rajesh Taneja
c129f430bb MDL-33027 themes: Modified heading to be displayed for section in all themes 2012-05-22 11:31:34 +08:00
Sam Hemelryk
4f4476081f Merge branch 'MDL-33055_master' of git://github.com/kordan/moodle 2012-05-22 14:31:59 +12:00
Dan Poltawski
5d6e603e1f Merge branch 'MDL-33167' of git://github.com/lazydaisy/moodle 2012-05-22 10:18:45 +08:00
Mary Evans
228408475c MDL-33167 theme_afterburner: added z-index to fix issue with yui3-widget when adding activity or resourse using new feature dialogue box 2012-05-22 03:05:42 +01:00
Sam Hemelryk
ad5d189c93 Merge branch 'MDL-33118' of git://github.com/lazydaisy/moodle 2012-05-22 11:38:03 +12:00
Sam Hemelryk
25bea62d33 Merge branch 'MDL-33137-master-2' of git://git.luns.net.uk/moodle 2012-05-22 10:49:59 +12:00