mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 13:10:08 +01:00
Code Issues Projects Releases Wiki Activity
59,907 Commits 36 Branches 523 Tags
Commit Graph

59907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
2ac738f8ed Merge branch 'w13_MDL-37782_m25_testtrans' of git://github.com/skodak/moodle 2013-03-26 16:09:06 +01:00
Eloy Lafuente (stronk7)
0d377c8d56 Merge branch 'w13_MDL-38671_m25_adodb' of git://github.com/skodak/moodle 2013-03-26 16:07:12 +01:00
Eloy Lafuente (stronk7)
cf20e809aa Merge branch 'MDL-38582' of git://github.com/timhunt/moodle 2013-03-26 16:03:37 +01:00
Eloy Lafuente (stronk7)
38495379a8 Merge branch 'MDL-38719' 2013-03-26 13:37:13 +01:00
Eloy Lafuente (stronk7)
caa30cd625 MDL-38719 forms: detectMissingSetType() handle of repetitions. 
It seems that formslib, for repetition, relies in the type
especified by the main (non existent at the end) element, instead
of assingning a type to each repetition.

Surely a result of storing types apart from elements. :-(

With the patch, detectMissingSetType() will detect
repeated elements (name containing '[') and will
perform the verification against that main element type.
 2013-03-26 13:28:47 +01:00
Eloy Lafuente (stronk7)
f35f07e9f7 MDL-38719 forms: add some missing types. 
This just adds some missing types to different places
causing phpunit tests to fail.
 2013-03-26 12:13:40 +01:00
Aparup Banerjee
3a7e4a80ad MDL-38564 fixed whitespace 2013-03-26 17:22:22 +08:00
Aparup Banerjee
be0eacf883 Merge branch 'MDL-38564-master' of git://github.com/ankitagarwal/moodle 2013-03-26 17:20:01 +08:00
Aparup Banerjee
d54bc60b33 Merge branch 'w13_MDL-38672_m25_purifier' of git://github.com/skodak/moodle 2013-03-26 17:12:18 +08:00
Ankit Agarwal
bf6b3c7a8a MDL-38564 Adding unit tests for the functions compare_activities_by_time_asc() and compare_activities_by_time_desc() 2013-03-26 16:12:01 +08:00
Damyon Wiese
0231f91d86 Merge branch 'w13_MDL-38673_m25_flowplayer' of git://github.com/skodak/moodle 2013-03-26 16:11:47 +08:00
Damyon Wiese
3dbfd15872 Merge branch 'm25_MDL-38336_SCORM_TOC_links_when_Display_course_structure_is_on' of https://github.com/scara/moodle 2013-03-26 15:40:04 +08:00
Damyon Wiese
41fdbc0d77 MDL-38468 Filelib: Fix ordering of new mimetypes 2013-03-26 15:16:15 +08:00
Damyon Wiese
2013daeb47 Merge branch 'm25_MDL-38468_Fix_MHTML_files_delivery' of https://github.com/scara/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-03-26 15:13:35 +08:00
Damyon Wiese
96a9273343 Merge branch 'MDL-38528' of git://github.com/timhunt/moodle 2013-03-26 14:57:04 +08:00
Damyon Wiese
a847da21d0 MDL-35875: Version bump for CSS changes 2013-03-26 14:50:18 +08:00
Damyon Wiese
95764ab7ef Merge branch 'MDL-35875-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/upgrade.txt
 2013-03-26 14:49:34 +08:00
Damyon Wiese
d0fd9726d1 Merge branch 'MDL-30438_b' of git://github.com/rwijaya/moodle 2013-03-26 14:29:57 +08:00
Damyon Wiese
c7c472a87a MDL-38147 Course: Added version bump for cache definitions. 2013-03-26 14:22:35 +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
Damyon Wiese
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
Damyon Wiese
59ef4aab75 MDL-38598 Forms: Version bump for js changes. 2013-03-26 13:33:52 +08:00
Damyon Wiese
37e50e9316 Merge branch 'MDL-38598-master-int' of git://github.com/FMCorz/moodle 2013-03-26 13:28:57 +08:00
Damyon Wiese
935ff91d5f Merge branch 'MDL-38380' of git://github.com/lazydaisy/moodle 2013-03-26 13:23:53 +08:00
Marina Glancy
4e53188a4b MDL-38147 bug fix, changed usage of non-existing function 2013-03-26 16:17:34 +11:00
Damyon Wiese
553b23989a Merge branch 'MDL-38390' of git://github.com/jonof/moodle 2013-03-26 13:12:29 +08:00
Damyon Wiese
1e425d185b Merge branch 'MDL-38429' of git://github.com/rwijaya/moodle 2013-03-26 12:59:53 +08:00
Damyon Wiese
d21a452dcc Merge branch 'MDL-38569-master' of git://github.com/FMCorz/moodle 2013-03-26 12:19:05 +08:00
Marina Glancy
290af25434 MDL-38147 fixed small bug on changed categories cache 2013-03-26 14:09:00 +11:00
Damyon Wiese
4e4ef99a15 Merge branch 'wip-mdl-36882' of git://github.com/rajeshtaneja/moodle 2013-03-26 10:41:33 +08:00
Damyon Wiese
688f9a46b3 Merge branch 'wip-mdl-36125' of git://github.com/rajeshtaneja/moodle 2013-03-26 10:04:31 +08:00
Damyon Wiese
febc08786e Merge branch 'wip-MDL-38650_master' of git://github.com/gjb2048/moodle 2013-03-26 09:38:46 +08:00
Gareth J Barnard
42d79f551d MDL-38650 theme_mymobile: Convert to new jQuery support infrastructure. 2013-03-25 10:26:35 +00:00
Damyon Wiese
0cdc5fc059 Merge branch 'MDL-38674-m' of git://github.com/andrewnicols/moodle 2013-03-25 16:00:00 +08:00
Damyon Wiese
3b5539af5e Merge branch 'MDL-38668' of git://github.com/stronk7/moodle 2013-03-25 15:51:01 +08:00
Damyon Wiese
8b18c1bae5 Merge branch 'w13_MDL-38675_m25_tcpdf' of git://github.com/skodak/moodle 2013-03-25 15:36:25 +08:00
Rossiani Wijaya
ecea65cace MDL-38429 Lesson Module: improve lesson code by reseting NULL value to use lowercase. 2013-03-25 14:07:18 +08:00
Damyon Wiese
8aae16fb41 MDL-38654 Deprecating gdversion setting: Fix typo for new install 2013-03-25 14:06:00 +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
Roman Tsukanov
1b58651681 MDL-38429: lesson report - Improve lesson statistics code. 2013-03-25 13:58:13 +08:00
Damyon Wiese
2e0b17051c Merge branch 'w13_MDL-15727_m25_jquery' of git://github.com/skodak/moodle 2013-03-25 12:27:32 +08:00
Rossiani Wijaya
3bd18935d7 MDL-30438 Lesson Module: fixed input text editable capability after checking/unchecking unmask option 2013-03-25 11:47:05 +08:00
Damyon Wiese
e909c7c390 Merge branch 'MDL-38044-master' of git://github.com/FMCorz/moodle 2013-03-25 11:30:36 +08:00
Rossiani Wijaya
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
Damyon Wiese
716f35954e Merge branch 'wip-MDL-34917_master' of git://github.com/gjb2048/moodle 2013-03-25 11:15:03 +08:00
Damyon Wiese
27a1d25f05 MDL-31681: Formatting changes to fix indentation 
Also removed/refactored some confusing use of references.
 2013-03-25 10:37:14 +08:00
Marina Glancy
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
Marina Glancy
9c6cfc083f MDL-38147 fixes to phpdocs and avoid using deprecated context functions 2013-03-25 13:23:37 +11:00
Marina Glancy
9178bbbcf3 MDL-38147 changed logic for building list in make_categories_list() 2013-03-25 13:23:37 +11: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