mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-13 20:26:32 +01:00
Code Issues Projects Releases Wiki Activity
53,800 Commits 36 Branches 523 Tags
Commit Graph

3016 Commits

Author SHA1 Message Date
Aparup Banerjee
b74ad708b1 Merge branch 'MDL-33307' of git://github.com/danpoltawski/moodle 2012-05-25 12:08:03 +08:00
Dan Poltawski
2ffd7f1824 Merge branch 'MDL-33060' of git://github.com/mouneyrac/moodle 2012-05-25 10:16:12 +08:00
Dan Poltawski
b6283a4970 MDL-33307 format_weeks - sort out week date display 
* Introduce function format_weeks_get_section_dates which is used
  as the consistent place to calculate the current section start and
  end date

* Rework callback_weeks_get_section_name to not use the above function
  rather than do crazy needless looping through all sections to work
  out the current week title.

* Change the just introduced is_current renderer function to share
  the format_weeks_get_section_dates function to ensure both the title
  and 'current week' are using the same dates to do their job
 2012-05-24 23:10:28 +08:00
Dan Poltawski
2ea6533a36 MDL-33307 format_weeks - highlight current week 2012-05-24 23:10:27 +08:00
Dan Poltawski
5744ea3682 Revert "MDL-33063 course: Reuse get_all_sections()" 
This reverts commit 66b494771ffc731472a374bef1b5cd12befd53b2.
 2012-05-24 20:42:58 +08:00
Dan Poltawski
108526897d Merge branch 'MDL-33063' of git://github.com/srynot4sale/moodle 2012-05-24 20:32:31 +08:00
Dan Poltawski
5c44b03559 Merge branch 'wip-MDL-33146-master' of git://github.com/abgreeve/moodle 2012-05-24 16:05:25 +08:00
Sam Hemelryk
cd7963eabd Merge branch 'MDL-32203c' of git://github.com/srynot4sale/moodle 2012-05-24 11:42:39 +12:00
Adrian Greeve
9ec5ee5168 MDL-33146 - course - Changed weekdates to sectionname to fix a JavaScript error 2012-05-23 16:13:32 +08:00
Dan Poltawski
c14cad3167 Merge branch 'MDL-33074_groupmode_button' of git://github.com/davosmith/moodle 2012-05-23 10:26:40 +08:00
Dan Poltawski
f4e9103a95 Merge branch 'MDL-32744-master-3' of git://git.luns.net.uk/moodle 2012-05-22 12:28:37 +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
bcf7175f4e MDL-33027 theme: Hidden section link will be displayed dimmed in section navigation 2012-05-22 11:31:35 +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
0b02faa076 Merge branch 'MDL-33051' of git://github.com/danpoltawski/moodle 2012-05-22 14:40:31 +12:00
Davo Smith
82d2a84002 MDL-33074 Course drag and drop upload - fixed incorrect group mode button 2012-05-21 22:11:38 +01:00
Ruslan Kabalin
405eaac272 MDL-32744: Maintain format specific CSS selectors in the format configuration. 
This updates existing core formats and introduce a configuration function.
 2012-05-21 13:53:04 +01:00
Dan Poltawski
f7290156ad Merge branch 'MDL-33126-master' of git://github.com/sammarshallou/moodle 2012-05-21 20:17:12 +08:00
sam marshall
57a42a24ad MDL-33126 Fix error on first view of new course page 2012-05-21 12:05:30 +01:00
Dan Poltawski
2b4f1cbc32 Merge branch 'wip-files23' of git://github.com/marinaglancy/moodle 2012-05-21 18:19:32 +08:00
Dan Poltawski
5c50d45b79 Merge branch 'MDL-22504_drag_and_drop_upload_integration' of git://github.com/davosmith/moodle 2012-05-21 17:22:13 +08:00
Davo Smith
1ddc3d1f4c MDL-22504 Course drag and drop upload - experimental setting is now a checkbox 2012-05-21 10:03:55 +01:00
Marina Glancy
559276b153 MDL-32247,MDL-32831,MDL-32900 Use correct url building of file type icons 
- function get_mimetypes_array() now contains also information about filetype groups and language strings
- use 'smart' human-readable mimetype description
- never determine filetype group based on filetype icon image! remove function mimeinfo_from_icon()
- get rid of class filetype_parser and file lib/filestorage/file_types.mm, replaced with functions file_get_typegroup(), file_extension_in_typegroup() and file_mimetype_in_typegroup()
- support multiple icon sizes, not only 16 and 32
- retrieve filetype icon only using proper functions file_..._icon() from lib/filelib.php throughout the code
- increase size of repository thumbnails to 90 and icons to 24 (will take effect when new icons exist)
 2012-05-21 16:01:04 +08:00
Davo Smith
f684250bda MDL-22504 Course drag and drop upload - removed browser specific content hacks, made 'text and link' dragging an experimental feature 2012-05-21 08:34:50 +01:00
Dan Poltawski
78de004483 MDL-33051 - topics format: remove section number from section column 
We don't think its necessary anymore
 2012-05-21 12:12:44 +08:00
Andrew Robert Nicols
2d1151817f MDL-30617 Center dialogue title 2012-05-18 10:28:53 +01:00
Andrew Robert Nicols
af75421c54 MDL-30617 Adjustments to styling of module chooser 
These changes fix several points and suggested changes:
* increase the size of the help popup to 800x600
* fix issues with centering of the dialogue
* swap next/cancel buttons
* convert next button to use string for 'Add'
* convert add text to 'Add an activity or resource'
 2012-05-18 10:10:20 +01:00
Dan Poltawski
5316007e08 MDL-24419 section availability: display availability info to teachers 2012-05-18 14:56:00 +08:00
Jerome Mouneyrac
96d3b93ba3 MDL-33060 remove some get_string from exceptions 2012-05-18 14:45:15 +08:00
Dan Poltawski
1edff8c7ed MDL-30617 lang: improve mod chooser strings 2012-05-18 12:46:13 +08:00
Eloy Lafuente (stronk7)
f823158b07 MDL-32941 Add transaction support to delete_categories 2012-05-18 00:06:42 +02:00
Eloy Lafuente (stronk7)
3ec163ddf1 MDL-32941 Reorganise functions a bit 2012-05-17 23:45:41 +02:00
Eloy Lafuente (stronk7)
754c2deab6 Merge branch 'MDL-32941' of git://github.com/mouneyrac/moodle 
Conflicts:
	course/externallib.php
	lib/db/services.php
	version.php
 2012-05-17 22:35:57 +02:00
Davo Smith
5a4decbc2d MDL-22504 Course drag and drop upload - (mostly) fixed the dragging of text between Firefox <==> Chrome 2012-05-17 21:19:52 +01:00
Dan Poltawski
46e046b7b3 MDL-30617 modchoser: minor tweaks 
* Change markup way from 'activity module style' to its own markup
* Remove 'a new' from the 'add an activity' string
* Remove the 'personalisation' from the nohelp lang string
 2012-05-18 00:27:42 +08:00
Andrew Robert Nicols
01e0e7044a MDL-30617 Add a javascript interface for adding modules to a course 
This interface allows for additional metadata, such as the module's help
and icon, to be displayed.
 2012-05-18 00:27:16 +08:00
Dan Poltawski
bc449b18a6 Merge branch 'MDL-33025-master-1' of git://git.luns.net.uk/moodle 2012-05-17 21:19:37 +08:00
Dan Poltawski
03ba9dac94 Merge branch 'MDL-33073-master-1' of git://git.luns.net.uk/moodle 2012-05-17 21:04:30 +08:00
Davo Smith
b64300fc42 MDL-22504 Improved drag and drop status message, fixed text dragged from firefox, fix icon 2012-05-17 13:59:54 +01:00
Dan Poltawski
6e0d176934 Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle 2012-05-17 20:45:37 +08:00
sam marshall
52f1406101 MDL-24419 Fix bug with section creation for new courses 2012-05-17 13:37:33 +01:00
Andrew Robert Nicols
537194ffc5 MDL-33073 Fix application of toolbox JS for drag/dropped content 2012-05-17 11:49:53 +01:00
Jerome Mouneyrac
8c507544d4 MDL-32941 fix criteriaerror exception code + wrong phpdoc scope 2012-05-17 13:36:40 +08:00
Aaron Barnes
66b494771f MDL-33063 course: Reuse get_all_sections() 2012-05-17 15:40:03 +12:00
Dan Poltawski
12ba24a8f8 Merge branch 'MDL-24419' of git://github.com/stronk7/moodle 2012-05-17 11:19:02 +08:00
Jerome Mouneyrac
d6ebe011b6 Fix codecheck/moodlechecker errors 2012-05-17 10:35:05 +08:00
Jerome Mouneyrac
d7238d0839 MDL-32941 change category name limit from 30 to 255 2012-05-17 10:35:02 +08:00
Fábio Souto
f2229c6895 MDL-32941 Implement core_course_update_categories, add webform and unittests 
Conflicts:

	admin/webservice/testclient_forms.php
	course/externallib.php
	lib/db/services.php
 2012-05-17 10:34:59 +08:00
Jerome Mouneyrac
6c6ec1d6b7 MDL-32941 use + operator instead array merge to avoid duplicate. Sort resulting array for better display to the client and for entring in the excluding algo. Exception reformatting. Minor formatting fixes. 2012-05-17 10:34:57 +08:00
Eloy Lafuente (stronk7)
20854c75f1 MDL-32941 external: core_course_get_categories() fixing. 
This includes:

- Multiple coding violations.
- Better detection of criteria, avoiding troublemaker 0 != ''
- Minor formatting.
- Ordering by path always to cause excludes to work ok.
 2012-05-17 10:34:14 +08:00