Commit graph

50704 commits

Author SHA1 Message Date
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
Aparup Banerjee
a92365080d Merge branch 'MDL-30607_override_email' of git://github.com/andyjdavis/moodle 2011-12-08 13:38:54 +08:00
Sam Hemelryk
9c6b40c614 Merge branch 'MDL-30518' of git://github.com/mackensen/moodle 2011-12-08 16:05:26 +13:00
Sam Hemelryk
4bd1fc7ef7 Merge branch 'w50_MDL-30528_m23_enrolroleid' of git://github.com/skodak/moodle 2011-12-08 15:50:42 +13:00
Sam Hemelryk
8e0169ebc2 Merge branch 'w50_MDL-30623_m23_guest' of git://github.com/skodak/moodle 2011-12-08 13:49:39 +13:00
Eloy Lafuente (stronk7)
08f2d600c1 Merge branch 'wip-MDL-30582-master' of git://github.com/samhemelryk/moodle 2011-12-08 01:36:44 +01:00
AMOS bot
36101938ff Automatically generated installer lang files 2011-12-08 00:31:13 +00:00
Eloy Lafuente (stronk7)
a8c3a5673f Merge branch 'MDL-26522_user_report_menu' of git://github.com/andyjdavis/moodle 2011-12-08 00:58:42 +01:00
Eloy Lafuente (stronk7)
01783c46d4 Merge branch 'MDL-27314' of git://github.com/timhunt/moodle 2011-12-08 00:45:15 +01:00
Sam Hemelryk
073b19a281 Merge branch 'MDL-29712' of git://github.com/mouneyrac/moodle 2011-12-08 12:41:21 +13:00
Eloy Lafuente (stronk7)
98cd882603 Merge branch 'wip-MDL-30222-m23' of git://github.com/samhemelryk/moodle 2011-12-08 00:39:25 +01:00
Sam Hemelryk
871c2e15c7 Merge branch 'master_MDL-30211' of git://github.com/danmarsden/moodle 2011-12-08 10:44:47 +13:00
Sam Hemelryk
b6965b11fc Merge branch 'master_MDL-30536' of git://github.com/danmarsden/moodle 2011-12-08 10:39:02 +13:00
Sam Hemelryk
74482042ac Merge branch 'MDL-28282-master' of git://github.com/ankitagarwal/moodle 2011-12-08 10:22:34 +13:00
Sam Hemelryk
c629cfae58 Merge branch 'MDL28588' of git://github.com/ankitagarwal/moodle 2011-12-08 10:19:53 +13:00
Petr Skoda
bb6ccfa53d MDL-30625 full support for main admin 2011-12-07 11:18:10 +01:00
Petr Skoda
66fe9746ba MDL-30623 fix null guest passwords in existing 2.2 sites 2011-12-07 09:13:34 +01:00
Petr Skoda
df05b844f6 MDL-30623 make sure guest password field is not null 2011-12-07 08:58:18 +01:00
Rajesh Taneja
51070abc78 MDL-30560 Forms Lib: 'type' key for repeat_elements is restored 2011-12-07 11:56:34 +08:00
Sam Hemelryk
5199434619 Merge branch 'wip-MDL-19147-master' of git://github.com/abgreeve/moodle 2011-12-07 14:20:48 +13:00
AMOS bot
8d582fd101 Automatically generated installer lang files 2011-12-07 00:31:14 +00: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
adrian@moodle.com
aa30d3e8ce MDL-30336 - login - Added a setting in security that allows auto complete to be set to off in password fields. 2011-12-06 15:50:26 +08:00
Petr Skoda
629303c1c8 MDL-30528 stop recreating role_assignments on every login attempt for each user
Credit goes to Luis Gustavo Mueller de Alcantara.
2011-12-06 08:48:38 +01:00
Ankit Kumar Agarwal
f17d78cac1 MDL-28588 Removing IN from SQL statments 2011-12-06 10:59:02 +05:30
Andrew Davis
492b00b7ba MDL-30607 message: removed an if condition that prevented you from clearing an overrident email address 2011-12-06 11:09:14 +08:00
Ankit Kumar Agarwal
6073fcbe16 MDL-28282 Scorm Restorting Groups support in Scomr reports 2011-12-06 07:20:51 +05:30
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 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