moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 03:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58254 commits 37 branches 544 tags 1.3 GiB
Commit graph

14829 commits

Author SHA1 Message Date
Dan Poltawski
4b5a6b1327 Merge branch 'wip-MDL-36317-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	course/format/lib.php
 2012-11-07 16:41:53 +08:00
Dan Poltawski
64f7d154db Merge branch 'wip-MDL-36113-master' of git://github.com/abgreeve/moodle 
Conflicts:
	lib/tests/csvclass_test.php
 2012-11-07 15:40:06 +08:00
Adrian Greeve
13041f2125 MDL-36113 - lib: Unit tests for importing csv files with empty lines in the middle of the file. 2012-11-07 15:34:36 +08:00
Adrian Greeve
415a6ffcc8 MDL-36113 - lib: Importing csv entries with empty lines in the middle doesn't throw errors. 2012-11-07 15:34:29 +08:00
Dan Poltawski
53b6a75a99 Merge branch 'wip-MDL-35279-master' of git://github.com/marinaglancy/moodle 2012-11-07 14:44:26 +08:00
Dan Poltawski
8f3020558d Merge branch 'wip-MDL-33017-m24-r2' of git://github.com/samhemelryk/moodle 2012-11-07 14:17:11 +08:00
Dan Poltawski
1383b1f29a Merge branch 'wip-MDL-36365-master' of git://github.com/abgreeve/moodle 2012-11-07 14:09:25 +08:00
Adrian Greeve
1222dc52e1 MDL-36365 - lib: The csv class now reads tab separated files with tabs at the end of the file. 2012-11-07 14:02:39 +08:00
Dan Poltawski
e9641de10d Merge branch 'w43_MDL-35771_m24_zindex' of git://github.com/skodak/moodle 2012-11-07 11:22:26 +08:00
Dan Poltawski
e830d6f98e Merge branch 'wip-MDL-30921-m24' of git://github.com/samhemelryk/moodle 2012-11-07 10:51:06 +08:00
Dan Poltawski
1191881888 Merge branch 'wip-MDL-36120-m24' of git://github.com/samhemelryk/moodle 2012-11-07 10:49:28 +08:00
Dan Poltawski
a8ccdd28e0 Merge branch 'wip-MDL-36386-m24' of git://github.com/samhemelryk/moodle 
Conflicts:
	version.php
 2012-11-07 09:33:47 +08:00
Sam Hemelryk
75af47ee1e MDL-36386 cache: upgrades now trigger definitions to be updated 2012-11-07 10:42:20 +13:00
Sam Hemelryk
47834bcd41 MDL-36120 cache: now uses sha1 and has an option for simple keys 2012-11-07 10:03:32 +13:00
Sam Hemelryk
b9c87ef86a MDL-33017 navigation: Tidied up after peer-review 2012-11-07 09:52:47 +13:00
Eloy Lafuente (stronk7)
086f5f9ea8 MDL-35762 whitespace fix 2012-11-06 17:03:57 +01:00
Eloy Lafuente (stronk7)
278714a012 MDL-35762 fix deprecated use of get_fast_modinfo() reset. 2012-11-06 16:37:43 +01:00
Eloy Lafuente (stronk7)
cd59310d1b Merge branch 'MDL-35762_fix' of git://github.com/andyjdavis/moodle 2012-11-06 16:13:47 +01:00
Andrew Robert Nicols
a3b6da6dfc MDL-36022 AJAX Remove shim on chooser dialogues 2012-11-06 13:48:01 +00:00
Dan Poltawski
87b210d98f Merge branch 'w43_MDL-34915_m24_simpleyui' of git://github.com/skodak/moodle 2012-11-06 16:03:40 +08:00
Sam Hemelryk
468cc57297 MDL-34342 cache: Added missing include and fixed old lang manager setting 2012-11-06 17:24:20 +13:00
Dan Poltawski
cdf9b0c86f Merge branch 'MDL-36266-notification-subject' of git://github.com/mudrd8mz/moodle 2012-11-06 11:59:24 +08:00
Dan Poltawski
61d49846a1 Merge branch 'wip-MDL-34342-m24' of git://github.com/samhemelryk/moodle 2012-11-06 11:26:45 +08:00
Dan Poltawski
653c89bcf3 Merge branch 'w43_MDL-36199_m24_pluginsingletons' of git://github.com/skodak/moodle 2012-11-06 10:32:47 +08:00
Dan Poltawski
2c36da50bc Merge branch 'wip-MDL-36362-m24' of git://github.com/samhemelryk/moodle 
Conflicts:
	version.php
 2012-11-06 10:03:23 +08:00
Dan Poltawski
980140e7cf Merge branch 'MDL-36023-master' of git://git.luns.net.uk/moodle 2012-11-06 09:35:31 +08:00
Sam Hemelryk
db19da5612 MDL-35998 admin: Fixed whitespace 2012-11-06 14:32:18 +13:00
Sam Hemelryk
5252ec82a2 Merge branch 'MDL-35998' of git://github.com/mouneyrac/moodle 
Conflicts:
	version.php
 2012-11-06 11:00:16 +13:00
Andrew Robert Nicols
d765695675 MDL-35230 AJAX Only load head and footer javascript if it present 2012-11-05 14:03:11 +00:00
Frederic Massart
cded83dd3c MDL-35675 forms: Remove constrain to viewport for popup calendar 2012-11-05 16:38:45 +08:00
Didier Raboud
ef46489f38 MDL-35675 forms: Popup calendar is not constrained any more 2012-11-05 16:37:48 +08:00
Dan Poltawski
918085d048 Revert "MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled" 
This reverts commit 45f93db912.
This reverts commit 3f798d4a3d.
 2012-11-05 15:20:22 +08:00
Dan Poltawski
1fc59b22de Merge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle 2012-11-05 15:04:25 +08:00
Dan Poltawski
825876620b MDL-35768 - increment redirect_if_major_upgrade_required 2012-11-05 14:25:24 +08:00
Dan Poltawski
f041dc5ff7 Merge branch 'wip-MDL-35768-master' of git://github.com/marinaglancy/moodle 2012-11-05 14:08:28 +08:00
Aaron Barnes
f493d528c2 MDL-35556 completion: Improve user completion data permission checking 2012-11-05 19:03:18 +13:00
Marina Glancy
45f93db912 MDL-35260 Course formats may have settings, be enabled, disabled and uninstalled 2012-11-05 11:46:34 +08:00
Marina Glancy
850acb3560 MDL-35768 MDL-36017 Avoid calling format_base::get_course() when not necessary 
- If we want to check fields 'numsections' or 'hiddensections' call course_get_format()->get_format_options()
- We still use extended course object in course/edit.php, update_course(), create_course(), and inside course formats
 2012-11-05 11:22:06 +08:00
Dan Poltawski
96846c2a9e Merge branch 'MDL-33621' of git://github.com/rwijaya/moodle 2012-11-05 11:12:32 +08:00
Andrew Davis
69632d42f0 MDL-35762 core_grade: adding unit tests for modinfolib.php 2012-11-05 09:35:10 +08:00
Andrew Davis
5e76227126 MDL-35762 core_grade: altered the code that determines whether an activity is visible on the user report 2012-11-05 09:35:10 +08:00
Sam Hemelryk
2e1e266c9a MDL-36362 cache: added simpledata definition option 2012-11-05 10:28:07 +13:00
Petr Škoda
05f6da14f7 MDL-33017 add new function for quickly finding out if user sees at least on course 
This will be used in navigation.
 2012-11-04 11:08:25 +13:00
Sam Hemelryk
58b602da8e MDL-33017 navigation: added current course and simplified loading 2012-11-04 11:06:49 +13:00
Dan Poltawski
3bd6e74afd Merge branch 'w42_MDL-35469_m24_geckover' of git://github.com/skodak/moodle 2012-11-02 12:07:11 +08:00
Andrew Robert Nicols
6caf3f5c74 MDL-33017 Show Currently viewed course in new node 2012-11-02 16:34:46 +13:00
Marina Glancy
695705f5d4 MDL-36317 Execute course format callback when course or module is set on page 2012-11-02 11:02:22 +08:00
Marina Glancy
e010b8503e MDL-35769 Give more flexibility for course formats to extend course navigation 
global_navigation::load_course_sections() now has more parameters and ensures
that current section and activity is loaded. This will allow course formats
to display hierarchical sections in navigation and have one callback for
overwriting whole course navigation
 2012-11-02 10:58:21 +08:00
Marina Glancy
b5cf83f080 MDL-36017 Fields numsections, hiddensections and coursedisplay are now format-specific options 
- Fields added to format_legacy as default course format options;
- Upgrade script copies fields values from table course to course_format_options;
- Fields removed from table course;
- Fields removed from edit course form;
- Since front-page course has a 'numsections' setting, format_site defines it as it's option;
- Removed accessing those fields in core code unless we know that format supports them and in this
  case instead of $course = $DB->get_record('course'); we use:
  $course = course_get_format($courseorid)->get_course(); This way all format-specific options
  are added to the $course object
 2012-11-02 10:56:19 +08:00
Marina Glancy
aea2e3c30d MDL-35768 Allow caching of section format options in course.sectioncache 2012-11-02 10:55:24 +08:00