Commit graph

12403 commits

Author SHA1 Message Date
Aparup Banerjee
bc3801cb9c MDL-30604 Added upgrade lines to upgrade.php(s) 2011-12-09 02:03:58 +01:00
Petr Skoda
db48cf080d MDL-30625 full support for main admin 2011-12-09 00:13:05 +01:00
Sam Hemelryk
e0745be16b Merge branch 'MDL-30660' of git://github.com/timhunt/moodle 2011-12-09 11:48:01 +13:00
Tim Hunt
1e92c729ba MDL-30660 javascript-static: M.util.show_confirm_dialog fixes 2011-12-08 17:51:45 +00:00
Aparup Banerjee
cdbd44f00e Merge branch 'wip-mdl-30560-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE 2011-12-08 15:54:55 +08:00
Aparup Banerjee
30e1b79889 Merge branch 'MDL-27432_gd_error_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE 2011-12-08 14:04:46 +08:00
Aparup Banerjee
d30043c852 Merge branch 'MDL-28710_rating_classes_22' of git://github.com/andyjdavis/moodle into MOODLE_22_STABLE 2011-12-08 13:48:27 +08:00
Rajesh Taneja
e61eecacc8 MDL-30560 Forms Lib: 'type' key for repeat_elements is restored 2011-12-07 12:04:54 +08:00
Andrew Davis
de276c9216 MDL-28710 rating: added some more classes to the html for entering ratings 2011-12-07 11:54:10 +08:00
Andrew Davis
aed70c6d40 MDL-27432 mod_data: improved handling of the absence of the GD php extension 2011-12-07 11:48:49 +08:00
Sam Hemelryk
28a6552570 MDL-30582 navigation: Fixed regression in generation of front page modules 2011-12-06 13:34:27 +13:00
Sam Hemelryk
6f2d62d022 MDL-27767 install: Shows notifications rather than throwing exceptions when installation encounters unexpected id for guest or admin 2011-12-06 12:22:17 +13: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
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
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
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)
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
Sam Hemelryk
50d15ca47f MDL-30543 navigation: Added missing course variable for user context 2011-12-02 12:31:12 +13:00
Sam Hemelryk
6416c6c25b Merge branch 'MDL-30007' of git://github.com/stronk7/moodle 2011-12-01 17:14:52 +13: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
Jason Fowler
c000545dee MDL-30386 - Blog - Adding RSS Feed link to the User blogs 2011-12-01 09:07:21 +08:00
Petr Skoda
8620bfee90 MDL-30517 use alternative block delete to prevent upgrade problems 2011-11-30 08:50:28 +01:00
Andrew Davis
d8aa5ec7a0 MDL-30260 message: added /message/upgrade.txt, checked calls to message_send() are supplying user.emailstop and improved message_send() to handle message requests that don't 2011-11-30 10:02:45 +08:00
Petr Skoda
fd20817aa9 MDL-30007 standardise text editor version files 2011-11-29 22:21:34 +01:00
Aparup Banerjee
1b39425dae Merge branch 'wip-MDL-28646' of git://github.com/mouneyrac/moodle 2011-11-29 16:38:02 +08:00
Eloy Lafuente (stronk7)
82fb6d1a08 Merge branch 'wip-MDL-30378-m22' of git://github.com/samhemelryk/moodle 2011-11-29 03:18:02 +01:00
Sam Hemelryk
56c062a45f MDL-30378 navigation: Front page activities are now added to the navigation on every page 2011-11-29 11:13:50 +13:00
Dongsheng Cai
ec0d6ea2a9 MDL-28646 Web service: core_course_get_contents()
1. Implement core_course_get_contents web service
2. Implement callbacks in folder, resource, page and url modules
3. Implement download script for web service
2011-11-28 16:22:38 +08:00
Sam Hemelryk
beb684ba11 Merge branch 'w48_MDL-30457_m22_deluserspictures' of git://github.com/skodak/moodle 2011-11-28 18:21:39 +13:00
Petr Skoda
8e470797e3 MDL-30467 notify devs deleted users do not have context 2011-11-26 09:17:02 +01:00
Petr Skoda
5bca744cad MDL-30467 skip deleted users during pix upgrade 2011-11-26 09:17:02 +01:00
Petr Skoda
03636668d4 MDL-30457 do not show pictures of deleted users
Since 2.2 deleted users do not have contexts.
2011-11-26 08:42:36 +01:00
Eloy Lafuente (stronk7)
c08a5622b8 Merge branch 'w47_MDL-29450_m22_removecoursecontent' of git://github.com/skodak/moodle 2011-11-23 23:01:27 +01:00
Petr Skoda
16ef46e7b6 MDL-29450 improve and cleanup course content removal
New keep roles/enrolments and groups/groupings options, notification CSS fixed, standardised notification texts, added missing delete of module blocks, fixed file deleting and some other minor issues.
2011-11-23 18:37:36 +01:00
Eloy Lafuente (stronk7)
8ccbf8d1e5 Merge branch 'MDL-30409-master' of git://github.com/sammarshallou/moodle 2011-11-23 13:33:39 +01:00
Eloy Lafuente (stronk7)
1bb98bd7a4 Merge branch 'wip-mdl-28947' of git://github.com/rajeshtaneja/moodle 2011-11-23 11:37:34 +01:00
Aparup Banerjee
c32e3a0a0a Merge branch 'MDL-30026_sqlsrv' of git://github.com/stronk7/moodle 2011-11-23 14:34:34 +08:00
Aparup Banerjee
9d06eb139c MDL-29995 Filters - added MDL issue number to Todo. 2011-11-23 13:51:11 +08:00
Aparup Banerjee
d7de1c8a62 Merge branch 'MDL-29995' of git://github.com/stronk7/moodle 2011-11-23 13:47:52 +08:00
Aparup Banerjee
4cff8cb550 Merge branch 'MDL-28562_wip' of https://github.com/jamiepratt/moodle 2011-11-23 12:36:35 +08:00
Aparup Banerjee
03848c4568 MDL-30335 formslib : phpdoc improvement 2011-11-23 11:47:06 +08:00
Aparup Banerjee
5cde86faa9 Merge branch 'MDL-30335' of git://github.com/timhunt/moodle 2011-11-23 11:41:58 +08:00
Eloy Lafuente (stronk7)
7722bb5df8 Merge branch 'MDL-27045' of git://github.com/timhunt/moodle 2011-11-23 03:01:50 +01:00
Eloy Lafuente (stronk7)
689461f4d8 Merge branch 'MDL-30259-master' of git://github.com/sammarshallou/moodle 2011-11-23 02:00:53 +01:00
Eloy Lafuente (stronk7)
0f6cc7a7cc Merge branch 'MDL-30203-master' of git://github.com/sammarshallou/moodle 2011-11-23 01:44:49 +01:00
Eloy Lafuente (stronk7)
1316fc8af9 Merge branch 'MDL-30306b' of git://github.com/timhunt/moodle 2011-11-23 01:18:00 +01:00