Dan Poltawski
a4051353d1
Revert "Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle"
...
This reverts commit 296c0247c6cc9e525721fc92b5a78c7146e6887d, reversing
changes made to 2511b0742a3695298d8216fe9723581c089909d7.
Conflicts:
lib/db/upgrade.php
version.php
2012-03-29 16:07:30 +08:00
Eloy Lafuente (stronk7)
296c0247c6
Merge branch 'MDL-31914-master-4' of git://git.luns.net.uk/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2012-03-27 10:10:17 +02:00
Sam Hemelryk
7a3a0a301b
MDL-31528 categories: Fixed up typo
2012-03-22 09:45:56 +13:00
Sam Hemelryk
f520dcd9ba
MDL-31640 course search: Coding style clean up
2012-03-21 09:49:38 +13:00
Sam Hemelryk
1a381535e6
Merge branch 'wip-mdl-31640-new' of git://github.com/rajeshtaneja/moodle
2012-03-21 09:41:32 +13:00
Sam Hemelryk
ef844d0a15
Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle
2012-03-20 16:47:17 +13:00
Aparup Banerjee
b36135b66a
Merge branch 'wip-MDL-31528-m23' of git://github.com/samhemelryk/moodle
2012-03-20 10:09:43 +08:00
Sam Hemelryk
f40400b91e
Merge branch 'w12_MDL-32045_m23_resetnorole' of git://github.com/skodak/moodle
2012-03-20 12:06:07 +13:00
Rajesh Taneja
fdfe706489
MDL-31640 course: removed extra error message, perpage is set properly, modulelink hidden field, and new context call is used.
2012-03-19 15:15:06 +08:00
Sam Hemelryk
96e7855298
MDL-31528 navigation: Fixed up missing break and optimised category.php
2012-03-19 19:32:15 +13:00
Rajesh Taneja
506cbfd749
MDL-31640 course: Move to, edit and search functionality in search.php is fixed with proper permission check
2012-03-19 12:02:02 +08:00
Sam Hemelryk
1a8ea682ef
Merge branch 'MDL-32004-master-2' of git://git.luns.net.uk/moodle
2012-03-19 14:37:49 +13:00
Petr Skoda
f20edd5208
MDL-32094 fix various E_STRICT compatibility problems
2012-03-18 18:37:24 +01:00
Andrew Robert Nicols
cac06a034d
MDL-31914 Ensure that completion criteria are deleted when removing a course module
2012-03-16 16:07:05 +00:00
Petr Skoda
2e15b12b81
MDL-32045 allow unenrolment of users without role via course reset
2012-03-16 10:55:30 +01:00
Sam Hemelryk
e141bc8109
MDL-31528 navigation: Replaced calls to deprecated context_instance_preload
2012-03-16 10:36:00 +13:00
Sam Hemelryk
f73cea5418
MDL-31528 navigation: Tidied up page for viewing and managing categories
2012-03-16 10:36:00 +13:00
Sam Hemelryk
8486f20713
MDL-31528 navigation: Fixed up navbar generation when editing categories
2012-03-16 10:36:00 +13:00
Tim Hunt
9665ecd275
MDL-19125 module restrictions: use a capability
...
1. This used to use a complex legacy system which was buggy.
2. It now relies on a new mod/...:addinstance capability for each module.
3. All the legacy code has been stripped out.
4. Old restriction data is upgraded by creating the necessary permission
overrides. Similarly, when old backups are restored, the old settings
are converted to be overrides.
5. The required addinstance capabilities will be added as a separate
commit.
6. There is a developer debug warning about modules that are missing the
addinstance capability, unless they are MOD_ARCHETYPE_SYSTEM mods.
2012-03-15 17:11:27 +00:00
Sam Hemelryk
772685e983
MDl-30616 course: Fixed bug with module subtype links
2012-03-14 13:56:22 +13:00
Eloy Lafuente (stronk7)
9767526f88
Merge branch 'MDL-30616-master-7' of git://git.luns.net.uk/moodle
2012-03-13 23:40:39 +01:00
Aparup Banerjee
c20cb1bab1
Merge branch 'wip-mdl-30817' of git://github.com/rajeshtaneja/moodle
2012-03-13 11:45:28 +08:00
Aparup Banerjee
e281281b84
Merge branch 'MDL-31935_search_restore_link' of git://github.com/davosmith/moodle
2012-03-13 10:00:33 +08:00
Andrew Robert Nicols
950a11e8df
MDL-32004 Set the defaultrequestcategory correctly when deleting/creating the default category
2012-03-12 13:15:25 +00:00
Rajesh Taneja
9e4baaf96f
MDL-30817 activity_completion: Fixed title and alt string (on checkbox) to have module name prefixed
2012-03-12 10:16:31 +08:00
Sam Hemelryk
2b824233ad
Merge branch 'wip-MDL-30906-master' of git://github.com/abgreeve/moodle
2012-03-12 14:20:02 +13:00
Davo Smith
87bef8f6d5
MDL-31935 Fixed restore backup link in course search
2012-03-07 13:38:29 +00:00
Eloy Lafuente (stronk7)
bb77ead0a4
Merge branch 'MDL-31255-master-3' of git://git.luns.net.uk/moodle
2012-03-07 00:18:27 +01:00
Adrian Greeve
551028dfd4
MDL-30906 - course - Changed the <hx> tags to follow a sequential order
2012-03-06 14:50:09 +08:00
Petr Skoda
f8311defeb
MDL-31301 use static textlib methods
2012-03-03 11:46:13 +01:00
Sam Hemelryk
887fd0e4c7
Merge branch 'MDL-31831' of git://github.com/stronk7/moodle
2012-03-01 14:34:09 +13:00
Eloy Lafuente (stronk7)
5dbfbacc49
MDL-31831 whitespace clean - take2
2012-03-01 02:20:35 +01:00
Ruslan Kabalin
93d46f4802
MDL-31255 Fix move of highlighted section when JS is off
2012-02-29 09:08:58 +00:00
Andrew Robert Nicols
59155a3fb3
MDL-30616 Move module metadata retrieval to new function
2012-02-28 13:44:42 +00:00
Dan Poltawski
bba67fcb31
MDL-31651 course/info: Fix hardcoded string
2012-02-27 15:32:55 +01:00
Jerome Mouneyrac
c78e11338a
MDL-30249 Display warning when downloading/uploading a file
2012-02-17 17:02:40 +08:00
Sam Hemelryk
be09c3f392
MDL-30888 course-search: Fixed typo
2012-02-15 16:28:44 +13:00
Sam Hemelryk
051806b2ee
Merge branch 'wip-mdl-30388' of git://github.com/rajeshtaneja/moodle
2012-02-15 16:23:57 +13:00
Rajesh Taneja
f53f582dc6
MDL-30388 Blocks: navigation block is visible on block search page
2012-02-15 10:14:50 +08:00
Rajesh Taneja
cf5b731c9c
MDL-30388 Blocks: Search view for block instances fixed, with proper page url and pagination
2012-02-15 10:14:49 +08:00
Andrew Robert Nicols
3754f4f3ee
MDL-31502 Check whether a category has subcategories or courses within it before using those variables
2012-02-07 09:30:04 +00:00
Andrew Davis
c85cf7df5c
MDL-29097 course: refactored to avoid having two seperate calls to events_trigger()
2012-01-31 09:00:53 +07:00
Eloy Lafuente (stronk7)
5f67e1f395
Merge branch 'MDL-31245-master-1' of git://git.luns.net.uk/moodle
2012-01-24 18:45:29 +01:00
Petr Skoda
dc76704067
MDL-31177 fix notices when exporting logs to ods
2012-01-21 19:51:28 +01:00
Andrew Robert Nicols
7aefaa91c9
MDL-31245 Add missing 'icon' class to highlight button in topics format
2012-01-18 14:12:09 +00:00
Petr Skoda
927010240f
MDL-31006 some more PHP54 notices
...
PHP54 compatibility - PhpStorm IDE is the best tool for this kind of work!!
2012-01-18 01:17:25 +01:00
Petr Skoda
b85b25ebb8
MDL-31006 fix various notices in PHP54
...
PHP54 compatibility
2012-01-18 01:03:20 +01:00
Eloy Lafuente (stronk7)
ec43e2267c
Merge branch 'MDL-30408-master' of git://github.com/sammarshallou/moodle
2012-01-17 01:43:19 +01:00
Sam Hemelryk
3ce3bb8861
MDL-31011 course: Fixed typo in comment
2012-01-16 14:49:56 +08:00
Sam Hemelryk
371fa34ecc
Merge remote-tracking branch 'skodak/w03_MDL-31011_m23_loglinks'
2012-01-16 14:49:55 +08:00
