Commit graph

11634 commits

Author SHA1 Message Date
Dan Poltawski
c64d2c0acd Merge branch 'wip-MDL-34346-master' of git://github.com/marinaglancy/moodle 2013-04-09 13:09:57 +08:00
Marina Glancy
0f232ed6e8 MDL-34346 fixed missing string and correct instantiating of repositories in tests 2013-04-09 14:40:15 +10:00
Dan Poltawski
69203ea923 Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle 2013-04-09 11:49:55 +08:00
Marina Glancy
9dd85edf02 MDL-38682 Allow configuring blocks for courses lists pages
Also fixed block configuration form error when pagetype string does not exist (for course- pages)
2013-04-09 13:24:31 +10:00
Marina Glancy
4202471a36 MDL-38541 Make sure course cache is cleared properly during upgrade
- Core upgrade MUST NOT call rebuild_course_cache() at all - update DB directly instead
- Plugins MUST call rebuild_course_cache(.., TRUE) for clearing the course cache and can not update DB directly
- Plugins MUST NOT call rebuild_course_cache() unless for clearing the cache
- Created function upgrade_ensure_not_running() to be included in other functions that can not be used during upgrade
2013-04-09 11:31:18 +10:00
Aparup Banerjee
37240ce5c6 Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle
Conflicts:
	version.php
2013-04-04 15:07:01 +08:00
Damyon Wiese
57bc1beb1b MDL-37009 Course - Fix typo in new lang string. 2013-04-04 11:24:13 +08:00
Damyon Wiese
200571507f Merge branch 'wip-MDL-37009-master' of git://github.com/marinaglancy/moodle 2013-04-04 11:22:20 +08:00
Eloy Lafuente (stronk7)
75fb383260 Merge branch 'MDL-38599-master-int' of git://github.com/FMCorz/moodle
Conflicts:
	mod/glossary/mod_form.php
2013-04-04 00:51:47 +02:00
Eloy Lafuente (stronk7)
1ca5ce1b33 Merge branch 'MDL-36570' of git://github.com/timhunt/moodle 2013-04-03 23:09:19 +02:00
Damyon Wiese
7bf602d9d3 Merge branch 'MDL-26644-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
2013-04-03 14:32:11 +08:00
Damyon Wiese
2188a69799 MDL-35073 Badges - Set of minor fixes for issues found during integration 2013-04-02 15:55:21 +08:00
Yuliya Bozhko
278065528a MDL-35073 badges: Open badges integration
The badges feature allows to integrate Mozilla "Open Badges" to issue, assign,
manage and display digital badges in Moodle. This feature supports:
-- badge creation and issuing based on criteria
-- badge baking and verification service
-- direct pushing of internal badges to external backpack
-- interanl and external badge display in Moodle
-- Moodle block to display latest badges
2013-04-02 15:49:02 +08:00
Marina Glancy
d1f8c1bd62 MDL-38708 Added course overview files (most often images) to courses 2013-04-02 11:08:21 +11:00
Marina Glancy
8e57a6df6d MDL-37009 Display courses and categories tree on /course/index.php using new renderer
Also /course/category.php
2013-04-02 10:54:49 +11:00
Marina Glancy
43e389eabf MDL-37009 Created functions in core_course_renderer to display courses and categories listings 2013-04-02 10:54:48 +11:00
Rex Lorenzo
c4dbfb2c91 MDL-35603 - Backup - Course import selector notice
* added new config option to determine length of courses returned by import
* added text indicator if there are more than X number of courses, similar to how the restore course list currently works
2013-03-28 15:24:51 -07:00
Colin Chambers
c7218aef8d MDL-36570 question editing: group answer/choice fields better. 2013-03-28 17:25:45 +00:00
Damyon Wiese
df9bdfb000 Merge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle
Conflicts:
	lib/upgrade.txt
2013-03-27 10:06:30 +08:00
Damyon Wiese
0c241b980a Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle
Conflicts:
	lib/upgrade.txt
2013-03-26 14:22:11 +08:00
Jason Fowler
6671fa735a MDL-35876 - Blocks - Adding verbose move here descriptions to blocks for accessibility 2013-03-26 14:21:38 +08:00
Frederic Massart
f3aadb1cd0 MDL-38599 glossary: Reformat settings form 2013-03-25 18:05:43 +08:00
Damyon Wiese
35f155519e Merge branch 'w13_MDL-38654_m25_gdversion' of git://github.com/skodak/moodle
Conflicts:
	lang/en/admin.php
2013-03-25 14:02:31 +08:00
Damyon Wiese
716f35954e Merge branch 'wip-MDL-34917_master' of git://github.com/gjb2048/moodle 2013-03-25 11:15:03 +08:00
Marina Glancy
eabbfa82d3 MDL-38147 Improvements to caching of course categories, coursecat::get_children() improvements
- Course categories caches are purged by event now
- session cache has additional 10 minutes ttl to clear itself and accomodate for permission changes that do not trigger event purging
- additional request-level cache for coursecat::get()
- We store only children of one category in one cache key
- Function coursecat::get_children() can return results sorted and/or paginated. Added tests
2013-03-25 13:23:15 +11:00
Marina Glancy
b33389d228 MDL-38147 Created class coursecat, added cache definition and lang strings 2013-03-25 13:20:33 +11:00
Frederic Massart
8819a83601 MDL-26644 course: Remove useless setting completionstartonenrol
This commit removes any trace of the setting 'Completion tracking
begins on enrolment' as it does not appear to do anything.
2013-03-25 08:28:01 +08:00
Gareth J Barnard
d46e26f682 MDL-34917 course: Jump to section navigation for 'One section per page'. 2013-03-23 17:01:32 +00:00
Petr Škoda
689096bc26 MDL-38654 do not test $CFG->gdversion
GD PHP extension is now required. Add-ons need to remove $CFG->gdversion tests. The worst case regression is that add-on will think GD is not available.
2013-03-22 16:57:55 +01:00
Eloy Lafuente (stronk7)
40b5cb2d71 MDL-37033 environment: add 2.5 brach details 2013-03-22 16:41:15 +01:00
Damyon Wiese
c2eb74df47 Merge branch 'MDL-34401-muc-pluginlib' of git://github.com/mudrd8mz/moodle
Conflicts:
	lib/db/caches.php
	version.php
2013-03-20 14:08:55 +08:00
Eloy Lafuente (stronk7)
1816c69c3f Merge branch 'MDL-38391-m' of git://github.com/andrewnicols/moodle 2013-03-19 13:17:51 +01:00
Andrew Robert Nicols
ad00331ebd MDL-38391 lib: Add missing string for YUI cachedef 2013-03-19 12:09:43 +00:00
Damyon Wiese
db98fa786e Merge branch 'wip-mdl-36395-m' of git://github.com/rajeshtaneja/moodle
Conflicts:
	version.php
2013-03-19 15:18:13 +08:00
Damyon Wiese
23477802b7 Merge branch 'MDL-38367_dnd_ui_improvements' of git://github.com/davosmith/moodle 2013-03-19 09:31:07 +08:00
Eloy Lafuente (stronk7)
0e5781a7ff Merge branch 'MDL-30166-master' of git://github.com/ankitagarwal/moodle 2013-03-13 01:08:26 +01:00
Rajesh Taneja
9a51c3d95c MDL-36395: Converted hard-coded MAX_USER_PER_PAGE to config setting
course, cohort, enrol, role, groups and forum used to use hard-coded
MAX_USERS_PER_PAGE=100 for rendering user list. This has been converted
to $CFG->maxusersperpage.
2013-03-12 17:14:53 +08:00
Ankit Agarwal
7a241d8102 MDL-30166 Remove deprecated %fullname% from core
Thanks to Matheus Kautzmann for the initial patch.
2013-03-12 10:38:09 +08:00
Davo Smith
66079e28fd MDL-38367 course dndupload - various tweaks to the UI
Switched to Moodle-style dialog boxes (thanks Andrew for the pointer)
Enter button now submits the form (from within the 'name' field)
Upload button is disabled when the name is empty (if the name is required for the selected handler)
Dialog now has 'What do you want to do with this text?' and 'Name' for the text
Entire course section now has a class added when you drag over it (to enable it to be styled in the future)
2013-03-11 22:44:55 +00:00
David Mudrák
0063302436 MDL-34401 Add language strings for the new cache definitions 2013-03-11 12:51:30 +01:00
Frederic Massart
8158fe0542 MDL-36900 repository: File Manager new folder UI improvements 2013-03-08 10:21:01 +08:00
Dan Poltawski
dbf8c92f73 MDL-38352 - use ISO ISO 3166-1 name for Libya 2013-03-07 18:34:41 +08:00
Aparup Banerjee
c65e7fcbc8 Merge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle 2013-03-07 10:41:52 +08:00
Davo Smith
2748d8efdb MDL-33946 course dndupload - fixes to dialog when dragging text
Radio buttons have unique IDs, matching the label IDs
'What do you want to call this text' input moved down and disabled when 'label' selected
'Add page here' changed to 'Add text here'
2013-03-06 22:38:01 +00:00
Eloy Lafuente (stronk7)
641577eb32 Merge branch 'MDL-38352-en_fix' of git://github.com/mudrd8mz/moodle 2013-03-06 17:26:37 +01:00
Helen Foster
ca084ef149 MDL-38352 Merge English strings from the en_fix language pack 2013-03-06 16:44:39 +01:00
Damyon Wiese
915b7aca62 Merge branch 'MDL-38279' of git://github.com/timhunt/moodle 2013-03-05 15:22:38 +08:00
Damyon Wiese
775eeb1ac2 MDL-37935: Cache - fix spelling mistake in language string 2013-03-05 13:06:49 +08:00
Damyon Wiese
6be6b2b073 Merge branch 'wip-MDL-37935-m25' of git://github.com/samhemelryk/moodle 2013-03-05 13:05:57 +08:00
Eloy Lafuente (stronk7)
2673254919 Merge branch 'wip-MDL-32975-m25' of git://github.com/samhemelryk/moodle 2013-03-04 23:47:13 +01:00