d0fd9726d1
Merge branch 'MDL-30438_b' of git://github.com/rwijaya/moodle
2013-03-26 14:29:57 +08:00
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
8af0dffb50
Merge branch 'MDL-34311-master' of git://github.com/danpoltawski/moodle
...
Conflicts:
course/moodleform_mod.php
lib/upgrade.txt
2013-03-26 13:46:29 +08:00
37e50e9316
Merge branch 'MDL-38598-master-int' of git://github.com/FMCorz/moodle
2013-03-26 13:28:57 +08:00
290af25434
MDL-38147 fixed small bug on changed categories cache
2013-03-26 14:09:00 +11:00
3b5539af5e
Merge branch 'MDL-38668' of git://github.com/stronk7/moodle
2013-03-25 15:51:01 +08:00
8b18c1bae5
Merge branch 'w13_MDL-38675_m25_tcpdf' of git://github.com/skodak/moodle
2013-03-25 15:36:25 +08:00
8aae16fb41
MDL-38654 Deprecating gdversion setting: Fix typo for new install
2013-03-25 14:06:00 +08:00
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
2e0b17051c
Merge branch 'w13_MDL-15727_m25_jquery' of git://github.com/skodak/moodle
2013-03-25 12:27:32 +08:00
3bd18935d7
MDL-30438 Lesson Module: fixed input text editable capability after checking/unchecking unmask option
2013-03-25 11:47:05 +08:00
e909c7c390
Merge branch 'MDL-38044-master' of git://github.com/FMCorz/moodle
2013-03-25 11:30:36 +08:00
41e2a9591f
MDL-30438 Lesson Module: improve password field to disabled when password protect is set to no.
2013-03-25 11:26:50 +08:00
93c544bdb0
MDL-38147 Added functions coursecat::search_courses(), get_courses()
...
Also search_courses_count(), get_courses_count();
Added unittests
2013-03-25 13:23:38 +11:00
9c6cfc083f
MDL-38147 fixes to phpdocs and avoid using deprecated context functions
2013-03-25 13:23:37 +11:00
9178bbbcf3
MDL-38147 changed logic for building list in make_categories_list()
2013-03-25 13:23:37 +11:00
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
15d50fffd8
MDL-38147 Performance improvements to coursecat class:
...
- Retrieve and cache only often-used fields of course category
- Removed function coursecat::get_all_visible() as potentially causing performance issues
- removed function coursecat::get_all_parents() as ineffective and unnecessary, replaced with get_parents()
- retrieve all fields from course_categories when unretrieved field is accessed
Also some code improvements:
- rename functions starting with _ , rename arguments, etc.
2013-03-25 13:23:14 +11:00
e1d54562ce
MDL-38147 deprecated get_categories(), change usage to coursecat
2013-03-25 13:23:06 +11:00
8db5dcb7cd
MDL-38147 deprecated get_child_categories(), change usage to coursecat
2013-03-25 13:22:56 +11:00
bc81b0065c
MDL-38147 deprecated get_all_subcategories()
2013-03-25 13:22:38 +11:00
9bad61dbfe
MDL-38147 deprecated create_course_category(), change usage to coursecat. Also avoid direct DB update of table course_categories
...
changed to usage of
- coursecat::create()
- coursecat::update()
2013-03-25 13:22:26 +11:00
2d8a275bab
MDL-38147 deprecated get_course_category(), change usage to coursecat
2013-03-25 13:21:20 +11:00
6e1d1ee0e7
MDL-38147 deprecated move_category(), course_category_hide(), course_category_show(), change usage to coursecat
...
All usages in core replaced with:
- coursecat::change_parent()
- coursecat::hide()
- coursecat::show()
2013-03-25 13:21:09 +11:00
deb65cedc4
MDL-38147 deprecated category_delete_move(), category_delete_full(), change usage to coursecat
2013-03-25 13:21:04 +11:00
4e0b6025ad
MDL-38147 deprecated make_categories_list(), change usage to coursecat
2013-03-25 13:20:46 +11:00
b28bb7e8c7
MDL-38147 Added coursecatlib_test.php, changed other tests to use coursecat::create() for creating category
2013-03-25 13:20:39 +11:00
b33389d228
MDL-38147 Created class coursecat, added cache definition and lang strings
2013-03-25 13:20:33 +11:00
adfcc976f6
Merge branch 'MDL-31681' of https://github.com/Lightwork-Marking/moodle
2013-03-25 10:15:38 +08:00
b45ba7f6fa
MDL-34311 formslib: warn when no param type set
...
Params without a type set will not be getting cleaned, so if developers
really do not want cleaning, they should set it explicitly.
2013-03-25 09:30:51 +08:00
619fe67e32
MDL-38598 form: Prevent flickering due to advanced fields
2013-03-25 08:28:32 +08:00
c7289da7eb
MDL-38654 add full $CFG->gdversion backwards compatibility for now
2013-03-24 22:18:49 +01:00
3f0ea6d8a7
MDL-31681 added core_grade_get_definitions web service function
2013-03-25 08:38:05 +13:00
e5f4ba84ab
MDL-38675 import tcpdf 5.9.209
2013-03-24 18:59:33 +01:00
dbd349ab09
MDL-38668 timezones: update to tzdata 2013b
2013-03-24 10:42:28 +01:00
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
c3f31a3ded
MDL-38581 move forum discussion and post generators to proper place
2013-03-22 13:21:35 +01:00
63c88397f5
MDL-15727 basic jQuery support
...
See http://docs.moodle.org/dev/jQuery for more details.
2013-03-22 13:09:50 +01:00
f2c0aba81d
MDL-38044 form: Added collapse/expand all buttons
2013-03-22 16:25:48 +08:00
fedcc83016
Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle
2013-03-20 17:06:22 +01:00
acfee0d4ba
MDL-38035 Conditional availability: Support multilang custom user fields
2013-03-20 15:57:53 +00:00
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
80d852fa23
Merge branch 'MDL-38373' of git://github.com/stronk7/moodle
2013-03-20 11:05:38 +08:00
cfe6a96f0a
Merge branch 'MDL-38470-m' of https://github.com/andrewnicols/moodle
2013-03-20 01:47:52 +01:00
c5952e06f1
MDL-38470 JavaScript: Rebuild moodle-core-tooltip with Shifter
2013-03-20 00:46:33 +00:00
e6f94aaa11
MDL-38515 JavaScript: Partially revert 4f65d03b08
...
It was going to cause some continuous logging in the console
annoying developers on 2.5 all the time. It may be reintroduced
once filepickers are converted to proper YUI modules.
2013-03-20 01:02:45 +01:00
b2b54ad7fe
Revert "MDL-38515 JavaScript: Correct module dependencies for core_filepicker"
...
This reverts commit babf34d5cf
2013-03-20 00:55:32 +01:00
87b6981e25
MDL-38035 api: doc get_condition_user_fields() new param.
2013-03-20 00:09:43 +01:00
1d962a1984
Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle
2013-03-19 23:54:27 +01:00
354ec0691b
Merge branch 'MDL-37664-master' of https://github.com/lucisgit/moodle
2013-03-19 23:31:21 +01:00
Damyon Wiese