50676 Commits

Author SHA1 Message Date
Sam Hemelryk
e52a5d3ab2 MDL-30582 navigation: Fixed regression in generation of front page modules 2011-12-06 13:32:59 +13:00
Sam Hemelryk
ecb731cb03 MDL-30222 Fixed home page redirection madness. Thank you Julien Boulen for providing the solution 2011-12-06 12:09:01 +13:00
AMOS bot
2096f007e3 Automatically generated installer lang files 2011-12-05 18:36:36 +01:00
AMOS bot
a539bd0a8e Automatically generated installer lang files 2011-12-05 18:19:29 +01:00
Tim Hunt
edfa0d800f MDL-29579 quiz statistics, include qtext in full XHTML export. 2011-12-05 15:44:01 +00:00
Eloy Lafuente (stronk7)
42f6b3f1d7 weekly release 2.3dev 2011-12-05 12:17:37 +01:00
Eloy Lafuente (stronk7)
01f7f6f9aa Moodle release 2.2 v2.2.0 2011-12-05 12:09:08 +01:00
Eloy Lafuente (stronk7)
3fdc4d0414 Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-12-05 11:55:06 +01:00
Eloy Lafuente (stronk7)
da78edea18 Merge branch 'MDL-30340-sticky-blocks_simplify_frontpage_ui' of git://github.com/stronk7/moodle 2011-12-05 10:57:53 +01:00
Eloy Lafuente (stronk7)
0e92570cca Merge branch 'MDL-30340.sticky_category_blocks' of git://github.com/stronk7/moodle 2011-12-05 10:55:06 +01:00
Martin Dougiamas
192a3380f1 MDL-30340 blocks - fix/restrict frontpage dark magic application
It seems that there are some overlapping constants in the blocks
subsystem that were causing some code, initially planned only
to frontpage, to be executed in other contexts. This commit moves
the bui_editingatfrontpage condition as root condition.
2011-12-05 10:28:54 +01:00
Dan Marsden
62169a677d MDL-26974 - add extra logging information all the time - not just when debugging is on. 2011-12-05 21:38:27 +13:00
Andrew Davis
6278ce451f MDL-28710 rating: added some more classes to the html for entering ratings 2011-12-05 14:57:36 +08:00
AMOS bot
140fd1e23c Automatically generated installer lang files 2011-12-05 00:30:55 +00:00
Eloy Lafuente (stronk7)
49ae1fdcea MDL-30340 blocks - incorrect option in user profile template and missing lang string in my template 2011-12-05 01:14:19 +01:00
Eloy Lafuente (stronk7)
d4e71a4eed MDL-30340 blocks - hide some redundant pagetypepattern options at front page
The dual front-page/system-wide form to edit blocks can
be reduced asuming that, always:

A) system sets the context to system,
   recursively and with page-type set to "*"
B) frontpage only sets the context to site-course,
   non-recursively and with page-type set to "site-index"
C) frontpage all added sets the context to site-course,
   recursively and with paget-type set to "*"

And that is the change that this patch provides, by:

1) detecting properly if we are editing blocks @ protpage
2) passing that information to the form data processor
3) setting parentcontextid, showinsubcontexts and
   pagetypepattern following the A, B, C immutables above.

Finally, and affecting some other system-wide pages, there
are cases (my, user templates...) having only one possible
pagetypepattern, and it looks badly if the page has subpages, so
for those system-wide cases we are showing exceptionaly the
pagetypepattern statically. This will be revisited once MDL-30574
is decided and implemented, although perhaps it's ok to leave it
as default to places with only one pagetypepattern available.
2011-12-05 01:09:02 +01:00
Mayank Gupa
75638e0ab0 MDL-30579, fixing Data Model Elements are being initialized with an empty string 2011-12-05 05:17:40 +05:30
David Mudrak
9d2c424d83 MDL-30340 Block stickiness computation improvements
This is an attempt to clean up and fix the computation of the block
stickiness. At first, the page pattern can't be ignored because the user
may want to currently try to limit the page pattern. Second, the
site-index pattern can be forced only if the user selected 'Front page
only' as the page context.
2011-12-03 16:57:21 +01:00
David Mudrak
e3cdf40ff5 MDL-30340 Always generate pagetype patterns in the block settings form
This is an alternative solution to MDL-27812. If the current block
instance has page type set to site-index, we need to provide a way how
that page type pattern can be reset back to other value.
2011-12-03 16:57:21 +01:00
David Mudrak
7c600d46aa MDL-30340 Trivial change in PHP doc block - the function does not accept any params 2011-12-03 16:57:21 +01:00
Eloy Lafuente (stronk7)
458fdc5280 MDL-30340 blocks - add back 'any page' support to course cats
Added the * option that is not affected by the 'varying-pagetype'
problem that has been detected and issued @ MDL-30564. So now, it's
(back) possible to define coursecat blocks to be spread over children
coursecats/courses/modules (contexts).
2011-12-03 15:52:24 +01:00
Eloy Lafuente (stronk7)
bf69e333fe Merge branch 'w49_MDL-30538_m22_versions' of git://github.com/skodak/moodle 2011-12-03 12:30:49 +01:00
Eloy Lafuente (stronk7)
b2221ee59c MDL-30340 blocks - avoid lockin'blocks in subcontexts.
Everytime that one block instance is edited @ any subcontext,
guarantee that the 'bring back' pattern (* = all pages) is
available, so the block can be reseted to its original context
2011-12-03 11:21:48 +01:00
Petr Skoda
cd2f3c17f9 MDL-30538 add missing course format versions and fix email filter file name typo 2011-12-03 08:40:53 +01:00
Tim Hunt
0030db53d8 MDL-30558 question bank, missing string with obscure permissions.
AMOS BEGIN
 MOV [selectcategoryabove,mod_quiz],[selectcategoryabove,question]
AMOS END
2011-12-02 14:52:01 +00:00
Dan Marsden
c72c635689 MDL-30211 imsenterprise enrolment - set up default enrolment methods in new courses 2011-12-02 22:41:51 +13:00
Dan Marsden
aff3a5d60c MDL-30536 Choice - remove setType so that validation works when JS is disabled 2011-12-02 21:16:21 +13:00
Dan Marsden
b27917eea4 MDL-30028 - use page pref correctly when pagination or re-ordering 2011-12-02 21:07:59 +13:00
Jerome Mouneyrac
d2f127e65c MDL-29712 REST-XML server was translating too many HTML characters. use htmlspecialchars instead of htmlentities. Translated characters by htmlspecialchars are compatible with XML validation, and so XML parsers for javascript, java... 2011-12-02 11:26:48 +08:00
Andrew Davis
97451e029b MDL-26522 grade: made the user selection drop down on the user report behave more sensibly 2011-12-02 09:48:36 +08:00
AMOS bot
53581c7689 Automatically generated installer lang files 2011-12-02 00:30:48 +00:00
Sam Hemelryk
50d15ca47f MDL-30543 navigation: Added missing course variable for user context 2011-12-02 12:31:12 +13:00
Igor Sazonov
21beddafa8 MDL-27314 quiz attempts cannot be deleted in separate groups mode. 2011-12-01 16:22:43 +00:00
Eloy Lafuente (stronk7)
d0e016f53f Moodle release 2.2rc1 v2.2.0-rc1 2011-12-01 12:12:21 +01:00
Eloy Lafuente (stronk7)
6451a6b15c Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-12-01 12:04:08 +01:00
Eloy Lafuente (stronk7)
773d1ec56b Merge branch 'MDL-30544_disable_notifications' of git://github.com/andyjdavis/moodle 2011-12-01 10:38:40 +01:00
Andrew Davis
f6ce2eb25a MDL-30544 message: prevented the temporarily disable notifications checkbox from erasing your messaging preferences 2011-12-01 16:54:48 +08:00
Jerome Mouneyrac
3b40f3b1a7 MDL-30496 fix upload max size issue when server limit is set + return some kind of json error object for filenameexists and oversizedfile errors 2011-12-01 15:13:52 +08:00
Sam Hemelryk
6416c6c25b Merge branch 'MDL-30007' of git://github.com/stronk7/moodle 2011-12-01 17:14:52 +13:00
Aparup Banerjee
0f4c6067e5 MDL-30386 blog : saved a function call 2011-12-01 12:03:31 +08:00
Aparup Banerjee
9be14d29e4 Merge branch 'wip-MDL-30386-master' of git://github.com/phalacee/moodle 2011-12-01 11:54:25 +08:00
Aparup Banerjee
0fa557d5fd Merge branch 'MDL-30260_disable_messages' of git://github.com/andyjdavis/moodle 2011-12-01 11:24:47 +08:00
Jerome Mouneyrac
264764e222 MDL-30459 when one filename already exist we bypass the execution and continue. We just return the error into the json string 2011-12-01 15:56:15 +13:00
Sam Hemelryk
7bebeb2a29 Merge branch 'wip-mdl-30421' of git://github.com/rajeshtaneja/moodle 2011-12-01 15:48:20 +13:00
Sam Hemelryk
bba1338a60 Merged branch 'MDL-30459' of git://github.com/mouneyrac/moodle.git with whitespace fixes 2011-12-01 14:43:39 +13:00
Sam Hemelryk
eb7ee15659 MDL-30376 mod_glossary: Integration tidy up 2011-12-01 14:17:10 +13:00
Sam Hemelryk
63a0768888 Merge branch 'wip-MDL-30376-master' of git://github.com/phalacee/moodle 2011-12-01 14:16:19 +13:00
Jason Fowler
c000545dee MDL-30386 - Blog - Adding RSS Feed link to the User blogs 2011-12-01 09:07:21 +08:00
Charles Fulton
5fad08b4a4 MDL-19147 - forum - Removed single discussions from the pull down menu for moving posts to different forums. 2011-12-01 08:54:46 +08:00
Sam Hemelryk
c3f185949f Merge branch 'MDL-30526' of git://git.luns.net.uk/moodle 2011-12-01 12:44:09 +13:00