Commit graph

266 commits

Author SHA1 Message Date
David Mudrak
20c207ab21 Merge branch 'master' into rubric
Conflicts:
	lib/db/upgrade.php
2011-10-13 22:42:47 +02:00
Aparup Banerjee
fc09870e0e Merge branch 'wip-MDL-27058-master' of git://github.com/samhemelryk/moodle.git (solved conflict) 2011-10-11 13:37:34 +08:00
Aparup Banerjee
bdfb2b71b7 Merge branch 'wip-MDL-28549-master' of git://github.com/samhemelryk/moodle 2011-10-11 09:46:16 +08:00
Sam Hemelryk
356a6de351 MDL-27058 navigation: Added a setting to control whether user forum links are added 2011-10-10 10:57:02 +13:00
Sam Hemelryk
e7f9b7abc8 MDL-28549 navigation: Added a missing login check when adding the calendar link to the navigation 2011-10-10 10:30:22 +13:00
Sam Hemelryk
dee1a0fd7a MDL-29224 navigation: Navigation now respects a modules onclick event when preparing navigation nodes 2011-10-06 19:32:27 +13:00
David Mudrak
9b8550f8d9 MDL-29479 Grading method plugins can extend module settings block
As a part of this, new class grading_controller is introduced and bunch
of smaller changes was done here and there.
2011-10-03 22:26:53 +02:00
Aparup Banerjee
d1e362405e Merge branch MDL-29186-master of git://github.com/samhemelryk/moodle
- resolved conflicts, minor whitespace and fixed quote.
- note: textlib_get_instance() is already deprecated
2011-09-13 16:06:21 +08:00
Aparup Banerjee
7eae2c5ae2 Merge branch MDL-29187-master of git://github.com/samhemelryk/moodle
- resolved conflict.
2011-09-13 13:52:31 +08:00
Aparup Banerjee
5433da6064 Merge branch MDL-29189-master of git://github.com/samhemelryk/moodle
- resolved conflicts.
2011-09-13 11:39:06 +08:00
Sam Hemelryk
016ba63816 MDL-23534 Added setting to set the site pages node to the sites shortname if desired 2011-09-12 13:46:04 +12:00
Sam Hemelryk
91d284c145 MDL-29186 multilang Reviewed the uses of course fullname and ensured things were being formatted consistently 2011-09-08 09:38:46 +12:00
Sam Hemelryk
63390481c4 MDL-29187 multilang Reviewed the uses of category name and ensured things are being formatted correctly 2011-09-08 09:37:07 +12:00
Sam Hemelryk
8ebbb06adf MDL-29189 mutlilang Reviewed the uses of course shortname and ensured things are being formatted consistently 2011-09-08 09:30:27 +12:00
Sam Hemelryk
9bf5af2181 MDL-24202 navigation Fixed bug caused by navigation overriding a CFG setting 2011-08-29 13:45:04 +12:00
Petr Skoda
6179c38af5 Merge branch 'wip-MDL-23626-master' of git://github.com/samhemelryk/moodle 2011-08-02 15:48:20 +02:00
Sam Hemelryk
ad4700977a MDL-26477 Added a setting to display course sections as links within the navigation 2011-08-02 15:24:59 +02:00
Sam Hemelryk
e96bc3f9e5 MDL-23626 Fixed bug causing course and general user activity reports to be marked active at the same time 2011-07-27 10:16:48 +08:00
Petr Skoda
696ddfe671 Merge branch 'wip-MDL-28040-master' of git://github.com/samhemelryk/moodle 2011-07-18 15:33:42 +02:00
Petr Skoda
fa9264b55b Merge branch 'wip-MDL-28184-master' of git://github.com/samhemelryk/moodle 2011-07-18 15:28:16 +02:00
Sam Hemelryk
2027c10ec4 MDL-28184 navigation: Tidied up handling of coursenode when adding course essentials 2011-07-13 14:58:57 +08:00
Sam Hemelryk
c4afcf84d9 MDL-28040 navigation: Fixed up error with navigation when dealing with categories that have a lower sort order than the parent. 2011-07-13 09:58:42 +08:00
Eloy Lafuente (stronk7)
f046f96f05 Merge branch 'MDL-28186' of git://git.luns.net.uk/moodle 2011-07-11 15:20:56 +02:00
Sam Hemelryk
50c1cb0394 Merge branch 'MDL-27855' of git://git.luns.net.uk/moodle 2011-07-06 13:17:54 +08:00
Sam Hemelryk
5b966cbb3b Merge branch 'MDL-28135' of git://github.com/nebgor/moodle 2011-07-06 10:53:48 +08:00
Ruslan Kabalin
9f05a1a640 MDL-28186 messaging: Fix "Enable messagning setting" infuence on the menus
"Enable messaging system" (Site administration > Advanced features) is
supposed to control messaging between site users only, thus it should not
remove user messging preferences menu item. However, it may remove instant
messging preferences from providers list for the user.

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-07-05 15:35:52 +01:00
Aparup Banerjee
728ebac7f2 MDL-28135 general Updating all hardcoded "docs.moodle.org/en/Development:" type doc links to "docs.moodle.org/dev/" 2011-07-05 14:27:31 +08:00
Petr Skoda
5607036a55 MDL-28167 fix missing new
And sloppy whitespace.
2011-07-04 16:42:55 +02:00
Dan Poltawski
8b0614d9ea MDL-27855 navigation - only display participants link with permissions 2011-07-03 10:52:32 +01:00
Sam Hemelryk
797cedc7cf MDL-25249 Tidied up calendar variable passing and removed session abuse 2011-06-29 14:50:38 +08:00
Sam Hemelryk
3992a46e89 MDL-27809 navigation: Fixed up a couple of minor issues after peer-review 2011-06-27 15:11:28 +08:00
Sam Hemelryk
e26507b361 MDL-27809 navigation: Reworked the caching within navigation and improved the ordering of events in order to reduce the use of session without serious impact on serverload 2011-06-24 16:42:41 +08:00
Sam Hemelryk
d38a4849b7 MDL-27940 navigaiton: Fixed an ordering problem so that when a parent was set for a node the nodes activity was accounted for 2011-06-23 11:29:26 +08:00
Tim Hunt
01d203566f MDL-27925 Give meaningful keys to all the standard navigation mod settings nodes. 2011-06-18 16:24:31 +01:00
Tim Hunt
0c2f94e081 MDL-27925 A way to get the all the keys of the child nodes of a node. 2011-06-18 16:23:53 +01:00
Sam Hemelryk
5436561c7c Merge branch 'MDL-27600-master' of git://github.com/sammarshallou/moodle 2011-05-30 10:05:59 +08:00
sam marshall
188a812794 MDL-27600 Navigation: Should be able to add nodes at other places than end of list 2011-05-27 13:18:03 +01:00
Eloy Lafuente (stronk7)
5fba6731d3 MDL-27541 course reports - allow teachers to view individual reports 2011-05-26 01:29:41 +02:00
Sam Hemelryk
870815faed Merged MDL-25805 Renamed property and function to be a little more descriptive 2011-05-03 15:41:34 +08:00
Aparup Banerjee
b9bcad24db MDL-25805 Roles propagated ugly hack for parent seeing child activities into navigation lib to display nav node. 2011-05-02 20:08:08 +08:00
Jenny Gray
52d1a8043c MDL-25651 add capability check to my private files navigation link 2011-03-31 14:44:35 +01:00
Petr Skoda
61baea5d22 Merge branch 'MDL-26903' of git://github.com/samhemelryk/moodle 2011-03-21 18:00:07 +01:00
Sam Hemelryk
c78262b542 navigation MDL-26903 Fixed regression to navigation ajax after CM changes 2011-03-21 10:22:28 +08:00
Petr Skoda
8f6c1f3488 MDL-26859 improve blog access control and prevent unnecessary blog includes 2011-03-20 13:34:51 +01:00
Eloy Lafuente (stronk7)
0dd8cb88e9 Merge branch 'w07_MDL-23939_20_completeuser' of git://github.com/skodak/moodle 2011-02-14 17:10:29 +01:00
Petr Skoda
44303ca67a MDL-25974 fix access to activities when role switched in hidden course and some coding style strict comparison fixes
The problem with strict comparison of numerical values fails badly if one is int and the other is string, moodle core apis do not guarantee return types much.
2011-02-13 16:17:47 +01:00
Petr Skoda
cc10c0b979 MDL-23939 minor course_display coding style improvements and inline docs 2011-02-12 23:06:11 +01:00
Aparup Banerjee
13801a49a2 MDL-23939 lazy load course_display with new course_get_display()
This change speeds up user login and makes the session smaller.
2011-02-12 22:45:17 +01:00
Petr Skoda
81c29ae06d Merge branch 'MDL-26266' of git://github.com/samhemelryk/moodle 2011-02-07 23:05:08 +01:00
Dongsheng Cai
100e0d4989 NAVIGATION MDL-25468 remove optional_param from navigationlib.php, use override_active_url to help find the correct node 2011-02-07 16:25:58 +08:00