Commit graph

12 commits

Author SHA1 Message Date
Damyon Wiese
f2f23af955 Merge branch 'MDL-42711-master' of git://github.com/nebgor/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-14 17:18:44 +08:00
Aparup Banerjee
cbb6e0d029 MDLSITE-2493 glossary filter alert dialog button string now translatable
Conflicts:
	filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js
	filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js
	filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js
	filter/glossary/yui/src/autolinker/js/autolinker.js -- M.core.alert api was changed.
2013-11-08 16:33:10 +08:00
sam marshall
96c3f75a4d MDL-34654 Glossary: ampersand breaks auto-linking 2013-10-25 18:15:03 +01:00
Frederic Massart
b123a543a6 MDL-40463 libraries: Deprecate get_courseid_from_context() 2013-07-11 15:54:36 +08:00
Eloy Lafuente (stronk7)
3ffb739586 MDL-32279 glossary filter: implement the setup() method. 2012-06-14 20:05:45 +02:00
Jason Fowler
c3963fbd9b MDL-30482 - Glossary - Adding capability to other areas using glossary 2012-03-21 10:22:53 +08:00
Aparup Banerjee
22154a3187 Revert "MDL-30482 - Glossary - Adding capability to other areas using glossary" (test failed)
This reverts commit aa423bd0e6.
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 d79de196c9.
2011-12-14 14:59:16 +08:00
Jason Fowler
d79de196c9 MDL-30482 - Glossary - Adding capability to other areas using glossary 2011-12-12 10:46:10 +08: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