mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-07 09:21:10 +01:00
Code Issues Projects Releases Wiki Activity
55,224 Commits 36 Branches 523 Tags
Commit Graph

939 Commits

Author SHA1 Message Date
Ankit Agarwal
4658aec5eb MDL-34459 course: Changing strictness of context call in get_category_or_system_context() to keep it consistent with past usages 2012-07-24 16:20:35 +08:00
Ankit Agarwal
1f364c87e3 MDL-34459 course: changing strictness of context calls as needed 2012-07-24 16:20:35 +08:00
Ankit Agarwal
9a5e297b4c MDL-34470 course: Replace all instances of get_context_instance() with context_xxx::instance() in course/ 2012-07-24 16:19:01 +08:00
Sam Hemelryk
18989c7a24 Merge branch 'MDL-34205-master' of git://github.com/micaherne/moodle 2012-07-23 12:52:35 +12:00
David Monllao
8a1a951f7c MDL-29563 course Hide duplication button in activities without backup2 support - Credit to Mark Nielsen 2012-07-19 15:33:30 +08:00
Aparup Banerjee
816ac8dfb5 Merge branch 'MDL-33767-master' of git://github.com/FMCorz/moodle 2012-07-17 17:22:48 +08:00
Frederic Massart
5946d376cb MDL-33767 Course: General section displays its title when required 2012-07-18 17:13:11 +08:00
Fred Woolard
b9609850f6 MDL-34072: Adjust SQL for Oracle. Remove subquery alias altogether. 2012-07-16 10:12:20 +12:00
Frederic Massart
b8514b6a1b MDL-33767 Course: The actions on default section redirect to the correct section 2012-07-13 08:59:19 +08:00
Dan Poltawski
e1980f8bb9 Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-10 09:43:23 +08:00
Sam Hemelryk
871c06e583 Merge branch 'MDL-29538_usercond' of git://github.com/markn86/moodle 2012-07-09 11:44:39 +12:00
Michael Aherne
945a81a943 MDL-34205 Activity chooser default setting 2012-07-06 15:29:08 +01:00
Petr Skoda
c52551dc3c MDL-8249 localise standard role names and descriptions if empty 2012-07-06 08:22:34 +02:00
sam marshall
110f73ad57 MDL-33426 Completion: Multilang activity names wrong in alt/title 2012-07-03 13:10:14 +01:00
Mark Nelson
a8f84c287c MDL-29538 core_condition: code cleanup 2012-06-26 15:18:52 +08:00
Mark Nelson
af2ce7806b MDL-29538 core_condition: delete the course modules records in the course_module_avail_fields table when deleted 2012-06-26 15:18:52 +08:00
Mark Nelson
76af15bb4c MDL-29538 core_condition: initial commit to add support for making things conditional on user profile fields 2012-06-26 15:18:51 +08:00
Eloy Lafuente (stronk7)
926b08ca4b Merge branch 'MDL-33623' of git://github.com/danpoltawski/moodle 2012-06-19 03:05:52 +02:00
Dan Poltawski
f715dc3fd5 Merge branch 'MDL-33573-master-1' of git://git.luns.net.uk/moodle 2012-06-18 15:35:05 +08:00
Frederic Massart
a41b1d96b6 MDL-33775 Course: fix redirect to course/section in paged mode 2012-06-18 15:10:33 +08:00
Dan Poltawski
2365213fdb MDL-33623 - course: remove incorrect logic for marker moving 2012-06-11 15:11:10 +08:00
Andrew Robert Nicols
928cc791e6 MDL-33573 Remove anchor from activity chooser link until JS is ready 2012-06-07 10:15:52 +01:00
Sam Hemelryk
e5b200cd65 Merge branch 'wip-mdl-33367' of git://github.com/rajeshtaneja/moodle 2012-06-06 15:19:49 +12:00
Dan Poltawski
7f88c42608 MDL-33441 course/lib.php prevent fatal error when no visible categories 2012-06-05 16:40:40 +08:00
Rajesh Taneja
ac5f641465 MDL-33367 course: Deprecated message added to move_section, so it can be removed in 2.5 2012-06-05 09:34:36 +08:00
Rajesh Taneja
eb01aa2c34 MDL-33367 course: move_section reuse move_section_to function 
Conflicts:

	course/lib.php
 2012-06-05 09:34:14 +08:00
Dan Poltawski
0ed8a933d6 Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle 2012-05-29 15:08:46 +08:00
sam marshall
540f89d7d4 MDL-33212 Course page: Eye icon should override other conditions 2012-05-28 16:17:39 +01:00
Dan Poltawski
6bea694b6c Revert "MDL-33212 Course page: Eye icon should override other conditions" 
This reverts commit 5d0d373733a42d1b5b25716c8d11087debd62942.
 2012-05-28 16:57:41 +08:00
Dan Poltawski
da5cd8cee8 Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle 2012-05-28 16:03:03 +08:00
Rajesh Taneja
33fcc04082 MDL-33347 course: section move is visible without ajax 2012-05-28 09:59:48 +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
sam marshall
5d0d373733 MDL-33212 Course page: Eye icon should override other conditions 2012-05-23 13:46:51 +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
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
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
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
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
Fábio Souto
2f951d866a MDL-32941 Added service definition and implementation for core_course_delete_categories() 
Included is a bug correction to categories_delete_move() which does not
respect showfeedback parameter, printing feedback even when not wanted
(this breaks the webservice output)

Conflicts:

	admin/webservice/testclient_forms.php
	lib/db/services.php
 2012-05-17 10:34:03 +08:00
Sam Hemelryk
7b06151288 Merge branch 'MDL-22504_drag_and_drop_upload_final' of https://github.com/davosmith/moodle 
Conflicts:
	course/lib.php
	theme/base/style/course.css
 2012-05-17 10:55:35 +12:00
Sam Hemelryk
fbb4c959b5 MDL-32881 Prevent course/view.php from being cached 
This should prevent browser caching which will ensure that changes made
using the course javascript (e.g. drag/drop, show/hide) will not be 'lost'
by using the browser back button.

This reverts commit 3aaa1843999eeb1832331ec5c8b30865fdba9710.
 2012-05-17 10:12:29 +12:00
Eloy Lafuente (stronk7)
dd420abadf Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	lib/db/upgrade.php
	lib/phpunit/lib.php
	version.php

Fixed:
    lib/db/upgrade.php - duplicate course->sectioncache add code
    lib/db/install.xml - cleanup needed because xmldb editor was not used
    lib/phpunit/classes/util.php - cleanup $GROUPLIB_CACHE on test reset
 2012-05-16 23:53:47 +02:00
Davo Smith
33b24bdd99 MDL-22504 Course drag and drop upload - moved file locations 2012-05-16 08:25:22 +01:00
Sam Hemelryk
ba94f1d503 Merge branch 'MDL-32889-master' of https://github.com/mackensen/moodle 2012-05-16 13:09:32 +12:00
Sam Hemelryk
a5bf3c520f Merge branch 'MDL-31215-master-11' of git://git.luns.net.uk/moodle 
Conflicts:
	course/lib.php
 2012-05-16 09:59:45 +12:00
Andrew Robert Nicols
7a9a07d24a MDL-31215 Add the ability to change activity titles using AJAX calls 2012-05-14 14:22:02 +01:00