1084 Commits

Author SHA1 Message Date
Aparup Banerjee
73c0d46416 Revert "MDL-30482 create new capability for viewing glossary entries"
This reverts commit b92ac8c07989a7a7d8659169d465341e55a95d72.
2011-12-15 15:49:55 +08:00
Aparup Banerjee
22154a3187 Revert "MDL-30482 - Glossary - Adding capability to other areas using glossary" (test failed)
This reverts commit aa423bd0e6a7b6c1f6cee4f95b46300e412551b4.
2011-12-15 15:47:46 +08:00
Jason Fowler
aa423bd0e6 MDL-30482 - Glossary - Adding capability to other areas using glossary 2011-12-14 15:00:30 +08:00
Aparup Banerjee
d4f2755206 Revert "MDL-30482 - Glossary - Adding capability to other areas using glossary"
This reverts commit d79de196c9f0d19b54454e5109bb6b8ab34f07eb.
2011-12-14 14:59:16 +08:00
Aparup Banerjee
099f23b7d7 Merge branch 'wip-MDL-30482-master' of git://github.com/phalacee/moodle 2011-12-13 11:11:47 +08:00
Jason Fowler
d79de196c9 MDL-30482 - Glossary - Adding capability to other areas using glossary 2011-12-12 10:46:10 +08:00
Charles Fulton
b92ac8c079 MDL-30482 create new capability for viewing glossary entries 2011-12-12 09:59:41 +08:00
Sam Hemelryk
d35fc666d6 Merge branch 'MDL-30198-master' of git://github.com/ankitagarwal/moodle 2011-12-12 13:54:48 +13:00
Mitsuhiro
ac4e8c3387 MDL-30198 Glossary Changing string during imports 2011-12-09 10:01:33 +05:30
Aparup Banerjee
46f2a9366a MDL-30604 Added upgrade lines to upgrade.php(s) 2011-12-09 01:28:59 +01:00
Sam Hemelryk
6416c6c25b Merge branch 'MDL-30007' of git://github.com/stronk7/moodle 2011-12-01 17:14:52 +13:00
Sam Hemelryk
eb7ee15659 MDL-30376 mod_glossary: Integration tidy up 2011-12-01 14:17:10 +13:00
Jason Fowler
1a9528e010 MDL-30376 - Glossary - Fixing ability to see the RSS feed for a glossary 2011-11-30 14:43:08 +08:00
Petr Skoda
633d5a07af MDL-30007 standardise module version files 2011-11-29 21:38:14 +01:00
Nadav Kavalerchik
10625d2efe MDL-30361 - mod/glossary/editcategories.php - fix spelling ($rightalignment) 2011-11-23 01:31:54 +02:00
Nadav Kavalerchik
efbbe2f047 MDL-29226 - right align table's cells, in Glossary edit categories page (when in RTL mode)(cherry picked from commit 9ace475) 2011-11-23 01:31:53 +02:00
Eloy Lafuente (stronk7)
9ff8c803be MDL-29992 filters - move related css from mod/glossary to filter/glossary 2011-10-29 19:02:22 +02:00
Eloy Lafuente (stronk7)
d307a1a70d MDL-29992 filters - move js popup from mod/glossary to filter/glossary
This commit moves the js popup to the new location of the filter. Also
it fixes one bug, with the js processing also glossary category links
leading to error, so now the categories are working again.
2011-10-29 19:02:07 +02:00
Eloy Lafuente (stronk7)
85a69ce123 MDL-29992 filters - new filter/glossary filter replacement for legacy mod/glossary/filter. 2011-10-29 17:50:58 +02: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 marshall
3e4c243500 MDL-27001 'Show description' feature part 3: Implementation for all modules
For modules that still used the 'old' generic object return from _get_coursemodule_info instead of returning a cached_cm_info object, I changed them to use the new format as part of this. This made a few areas of code regarding onclick links slightly nicer.
2011-09-06 11:03:06 +01:00
James Brisland
a8b2690bff MDL-28620 - Removed admin/generator.php include as it causes issues if this script is included from any other script that is running in the command line 2011-08-05 16:09:30 +01:00
Petr Skoda
595646d15b MDL-28344 remove the unused $CFG->framename 2011-07-14 21:40:50 +02:00
Eloy Lafuente (stronk7)
b86f930647 MDL-28048 glossary - fix double ampersand & missing string 2011-07-11 01:36:30 +02:00
Eloy Lafuente (stronk7)
bce3e3dca5 MDL-28048 glossary - add multilang support to categories 2011-07-11 01:02:06 +02:00
Aparup Banerjee
c5a8abfedd MDL-28169 Installation Added 2.1 upgrade (idiot proof) lines to upgrade scripts. 2011-07-07 11:40:38 +08:00
Eloy Lafuente (stronk7)
67fcc9989a Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle 2011-07-01 11:51:26 +02:00
Eloy Lafuente (stronk7)
49752ecb59 Merge branch 'MDL-28022-glossary-export' of git://github.com/mudrd8mz/moodle 2011-07-01 10:40:15 +02:00
Andrew Davis (andyjdavis)
346a32a75b MDL-27829 blocks: added some more page types to some _page_type_list() functions 2011-07-01 15:43:26 +08:00
David Mudrak
c9b3efd20c MDL-28022 glossary entry without attachment can be exported to Mahara as Leap2A content
The problem here was that the manifest file was written into the
'./files/leap2a.xml' instead of the './leap2a.xml' in the ZIP package.
I believe there was a bug in the write_new_file() using the 3rd parameter
incorrectly. A detailed review of all other modules using the same
method must happen soon.
2011-07-01 02:34:00 +02:00
Sam Hemelryk
f86e19b1ee Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle 2011-06-29 17:04:13 +08:00
Andrew Davis (andyjdavis)
b38e2e28a1 MDL-27829 blocks: altered the algorithm used to find plugin page types 2011-06-27 12:27:41 +08:00
Sam Hemelryk
6708a1f525 MDL-27810 portfolio: Added ->portfolioenabled checks before creating portfolio buttons to avoid initialising portfolio requirements 2011-06-21 10:35:53 +08:00
Eloy Lafuente (stronk7)
84a5f2d26e Merge branch 'MDL-27820' of git://github.com/stronk7/moodle 2011-06-15 11:59:52 +02:00
Eloy Lafuente (stronk7)
5edac71d16 MDL-27820 backup - fix backup of ratings 2011-06-15 11:01:41 +02:00
Eloy Lafuente (stronk7)
ee1235e7af Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle 2011-06-14 22:38:27 +02:00
Sam Hemelryk
46d3b9be73 Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes 2011-06-13 16:54:52 +08:00
David Mudrak
b61cf3ff8a MDL-22414 Merge branch 'master' into backup-convert
Conflicts:
	theme/base/style/core.css
2011-06-09 13:04:49 +02:00
Dongsheng Cai
b1627a92e5 MDL-26105 Block settings should contains less options, and be more user friendly
AMOS BEGIN
    MOV [page-blog-index, pagetype], [page-blog-index, blog]
    MOV [page-blog-x, pagetype], [page-blog-x, blog]
    MOV [page-tag-x, pagetype], [page-tag-x, tag]
    MOV [page-course-view-weeks, pagetype], [page-course-view-weeks, format_weeks]
    MOV [page-course-view-weeks-x, pagetype], [page-course-view-weeks-x, format_weeks]
    MOV [page-course-view-topics, pagetype], [page-course-view-topics, format_topics]
    MOV [page-course-view-topics-x, pagetype], [page-course-view-topics-x, format_topics]
AMOS END
2011-06-09 13:51:14 +08:00
David Mudrak
7e1450977e MDL-27732 Include the introformat field in the glossary module backups 2011-06-06 15:19:41 +02:00
David Mudrak
1b85912abb MDL-27729 Glossary module 1.9 backup converts to 2.0 format 2011-06-06 10:11:58 +02:00
Eloy Lafuente (stronk7)
f2e725930b MDL-27471 rating - whitespace cleanup 2011-05-25 16:54:51 +02:00
Eloy Lafuente (stronk7)
5b52ce19c5 Merge branch 'MDL-27625_master' of git://github.com/stronk7/moodle
Conflicts:
	mod/forum/lib.php
2011-05-25 16:37:43 +02:00
Eloy Lafuente (stronk7)
5693d56cd8 MDL-27625 rating - consider RATING_UNSET_RATING a valid rating value 2011-05-25 12:00:16 +02:00
Sam Hemelryk
2b04c41c58 MDL-27471 Adding mandatory component & ratingarea to the ratings API + other fixes
* Added the component and ratingarea fields and implemented it throughout
  the rating API as mandatory fields
* Cleanup rating indexes
* Upgrade forum/data/glossary ratings
* Moved the logic in the render_rating method to methods of the rating object.
* Added new callback for checking ratingareas
* Cleaned comments here and there
* Mark the xxx_get_participants methods as deprecated
* Refactor rate_ajax and ratingsuser_can_view_aggregate methods
* Cleaned up rating/index.php to use html_table object and moved inline styles to CSS.
* Added missing properties of the rating object that were being set throughout the rating
  API.
2011-05-23 12:35:39 +02:00
Sam Hemelryk
74cf2d0015 MDL-26704 Fixed up variable typo 2011-05-18 15:32:40 +08:00
Eloy Lafuente (stronk7)
94a74f549a MDL-26704 gradebook: adding TODO comment to avoid forgetting 2011-05-17 11:58:22 +02:00
Eloy Lafuente (stronk7)
dcc26efb70 Merge branch 'MDL-26704_user_outline_report_master' of git://github.com/andyjdavis/moodle 2011-05-17 11:55:04 +02:00
Andrew Davis (andyjdavis)
6ac149dce3 MDL-27387 rating: prevent the submission of ratings outside of the range allowed by the current scale 2011-05-11 11:29:31 +08:00
Andrew Davis (andyjdavis)
4433f871f2 MDL-26704 gradebook: added some intelligence to the dates displayed on the user outline activity report 2011-05-10 11:14:16 +08:00