Aparup Banerjee
c45c1e1f20
Merge branch 'w51_MDL-30613_m23_FULLME' of git://github.com/skodak/moodle
2011-12-12 14:36:59 +08:00
Aparup Banerjee
9f26a481ae
MDL-30603 synced and renamed incorrect ZF 1.10.6 file and name
2011-12-12 14:21:52 +08:00
Sam Hemelryk
94db939f7c
Merge branch 'w51_MDL-30364_m23_report' of git://github.com/skodak/moodle
2011-12-12 17:37:27 +13:00
Sam Hemelryk
0e3e2c82dd
Merge branch 'w51_MDL-30415_m23_yui2rollups' of git://github.com/skodak/moodle
2011-12-12 17:29:11 +13:00
Sam Hemelryk
07ae3349fc
Merge branch 'w51_MDL-30588_m23_switchrole' of git://github.com/skodak/moodle
2011-12-12 17:10:58 +13:00
Sam Hemelryk
16fdb8d070
Merge branch 'w51_MDL-30659_m23_yuidebug' of git://github.com/skodak/moodle
2011-12-12 16:36:51 +13:00
Eloy Lafuente (stronk7)
43cf3165f1
MDL-28180 backup - take rid of dupes in course_completion_aggr_methd
...
Conflicts:
version.php
2011-12-12 00:31:29 +01:00
Petr Skoda
a0b15989e7
MDL-30364 fix user report regressions
2011-12-10 20:18:44 +01:00
Petr Skoda
a1dd2a54e3
MDL-30415 prevent yui2 rollups in debug mode
2011-12-10 19:11:58 +01:00
Petr Skoda
adf0fc0e42
MDL-30621 prevent warnings when creating temp and cache dirs
2011-12-10 17:35:22 +01:00
Petr Skoda
cb664c3a0d
MDL-30659 fix use of yui filters
2011-12-10 13:46:15 +01:00
Petr Skoda
7edf3f7e82
MDL-30659 fix phpdocs problems
2011-12-10 13:16:18 +01:00
Petr Skoda
dbd7282ca3
DML-30588 do not require enrollment after switching of roles
2011-12-10 12:44:32 +01:00
Petr Skoda
0126413171
MDL-30610 dev versions should not satisfy version requirements
2011-12-09 21:50:58 +01:00
Petr Skoda
33dca15616
MDL-30613 use standard https checks
2011-12-09 21:28:04 +01:00
Tim Hunt
0019a9b7aa
MDL-30592 question_bank: make files in qtext work in the question list.
2011-12-09 19:23:53 +00:00
Tim Hunt
fdb5bc03f5
MDL-30592 quiz statistics, ensure images in the question text appear.
2011-12-09 19:23:46 +00:00
Tim Hunt
8c03be8c71
MDL-30592 moodlelib: new helper component_callback
...
I chose to be slighly inconsistent with plugin_callback in order to make a nicer API.
2011-12-09 19:23:36 +00:00
Tim Hunt
9d0ac0ffbb
MDL-27143 question bank: questions not saved when deleting a category.
...
Based on a fix by Nikhil Gupta.
2011-12-09 18:03:52 +00:00
sam marshall
7728860ae5
MDL-30655 Blocks: Moving block to top of list can cause (harmless) PHP warnings
2011-12-09 17:45:23 +00:00
Tim Hunt
511b4cf82c
MDL-30660 javascript-static: another yui3/ticket/2531561 work-around.
2011-12-09 12:40:57 +01:00
Eloy Lafuente (stronk7)
d6b380a364
Merge branch 'w50_MDL-30625_m23_adminorder' of git://github.com/skodak/moodle
2011-12-09 10:57:18 +01:00
Petr Skoda
b8d13becf9
MDL-30625 fail gracefully when admins not defined
2011-12-09 09:04:43 +01:00
Aparup Banerjee
70a7b8e1cd
Merge branch 'w50_MDL-27364_m23_recaptchahttps' of git://github.com/skodak/moodle
2011-12-09 11:07:20 +08:00
Aparup Banerjee
46f2a9366a
MDL-30604 Added upgrade lines to upgrade.php(s)
2011-12-09 01:28:59 +01:00
Eloy Lafuente (stronk7)
20405d1b44
Merge branch 'w50_MDL-30625_m23_adminorder' of git://github.com/skodak/moodle
2011-12-09 00:11:01 +01:00
Sam Hemelryk
f8b2e5458d
Merge branch 'MDL-30660' of git://github.com/timhunt/moodle
2011-12-09 11:46:09 +13:00
Tim Hunt
e16c0b9da6
MDL-30660 javascript-static: M.util.show_confirm_dialog fixes
2011-12-08 17:50:11 +00:00
Aparup Banerjee
5ac06899c7
Merge branch 'wip-mdl-30560' of git://github.com/rajeshtaneja/moodle
2011-12-08 15:51:27 +08:00
Aparup Banerjee
357317fb6e
Merge branch 'MDL-27432_gd_error' of git://github.com/andyjdavis/moodle
2011-12-08 13:56:51 +08:00
Aparup Banerjee
983fb3f4aa
Merge branch 'MDL-28710_rating_classes' of git://github.com/andyjdavis/moodle
2011-12-08 13:43:55 +08:00
Petr Skoda
bb6ccfa53d
MDL-30625 full support for main admin
2011-12-07 11:18:10 +01:00
Rajesh Taneja
51070abc78
MDL-30560 Forms Lib: 'type' key for repeat_elements is restored
2011-12-07 11:56:34 +08:00
Petr Skoda
b608b227ba
MDL-27364 use https for recaptcha when site runs via https
...
Based on solution by Rajesh Taneja.
2011-12-06 12:00:32 +01:00
Sam Hemelryk
e52a5d3ab2
MDL-30582 navigation: Fixed regression in generation of front page modules
2011-12-06 13:32:59 +13:00
Sam Hemelryk
3912cdd1de
MDL-27767 install: Shows notifications rather than throwing exceptions when installation encounters unexpected id for guest or admin
2011-12-06 12:21:57 +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
Andrew Davis
6278ce451f
MDL-28710 rating: added some more classes to the html for entering ratings
2011-12-05 14:57:36 +08: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
