mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-15 05:15:07 +01:00
Code Issues Projects Releases Wiki Activity
52,255 Commits 36 Branches 523 Tags
Commit Graph

52255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ruslan Kabalin
de132c20f8 MDL-32137 Fix message preference settings. 
When a messaging output is set to forced, users should not be able to change
that. Regression intoroduced in bb3546f3 made possible to change checkboxes
(but not avoid forced settings). This fix replace checkboxes for 'forced'
settings with the corresponding message, similar to how it worked for
disallowed before.
 2012-03-23 11:55:30 +00:00
Rossiani Wijaya
0f6e2f02aa MDL-32172 Lesson Module: add variable initialization for 2012-03-23 15:36:39 +08:00
Ankit Agarwal
af572078cf MDL-22510 libraries: Set wantsurl only when $setwantsurltome is set in 
require_login
 2012-03-23 14:40:35 +08:00
Rajesh Taneja
1366a7fab8 MDL-29331 Users: Participants list with user_details now show check box for bluk operation 2012-03-23 11:28:20 +08:00
Kanika Goyal
d84e5f43d1 MDL-31856 Choice: if choice not open, responses inconsistently displayed 2012-03-23 08:56:13 +05:30
Rossiani Wijaya
639818fc94 MDL-27710 lesson module: add the following jump options: unseen branch page, random page and random branch 2012-03-23 10:20:52 +08:00
Rajesh Taneja
1b4d2d56d9 MDL-31654 users: Added check for custom profile fields, if wrong data is passed then user will not be able to proceed 2012-03-23 10:13:37 +08:00
Rajesh Taneja
bd8dc9ba0a MDL-31654 users: removed hardcoding and added docblock on top of tim's patch 2012-03-23 10:13:37 +08:00
tim@netspot.com.au
d6aea4cc34 MDL-31654 users: custom profile menu fields will convert values to keys, so it can be processed 2012-03-23 10:13:37 +08:00
Sam Hemelryk
c856a1f60b weekly release 2.3dev 2012-03-23 12:19:47 +13:00
Sam Hemelryk
117bd705f3 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-03-23 12:11:57 +13:00
Dan Marsden
dbdc735559 MDL-32147 - use correct 404 for server type 2012-03-23 10:01:04 +13:00
Ruslan Kabalin
70ad827c6c MDL-11378 Add SMTP security protocol setting to email configuration 2012-03-22 15:29:17 +00:00
Ruslan Kabalin
43798a4efa MDL-32026 messaging: Fix non-existing variable in the error output 2012-03-22 15:12:40 +00:00
Andrew Robert Nicols
8d1f386385 MDL-32142 Add missing langstring for section backups 2012-03-22 14:52:28 +00:00
Jason Fowler
bcab2b21b3 MDL-30482 - Glossary - Fixing the capability controls for the recent activity block 2012-03-22 16:19:38 +08:00
Dan Marsden
6ceef54c6e MDL-32147 SCORM improve performance of 404s for files inside SCORM packages. 2012-03-22 20:05:59 +13:00
Aparup Banerjee
a72996fe71 Revert "MDL-17327 - data - improved the sql query for very large advanced searches" 
This reverts commit 72d4340a0e0acd69a0ba91dc262ea57e86a52117.

Testing cross db compatibility failed.
 2012-03-22 09:21:25 +08:00
Sam Hemelryk
7aea08e1b0 MDL-31857 phpunit: PHPDoc and typo fixes during integration 2012-03-22 10:45:17 +13:00
Sam Hemelryk
3222f6eca1 Merge branch 'w12_MDL-31857_m23_phpunit' of git://github.com/skodak/moodle 2012-03-22 10:44:04 +13:00
Sam Hemelryk
7a3a0a301b MDL-31528 categories: Fixed up typo 2012-03-22 09:45:56 +13:00
Petr Skoda
5bd4040866 MDL-31857basic phpunit support 
Thanks Eloy Lafuente, Tim Hunt and Sam Hemelryk for valuable feedback and ideas.
 2012-03-21 10:31:37 +01:00
Dan Poltawski
727dac2f34 Merge branch 'wip-MDL-27236-master' of git://github.com/marinaglancy/moodle 2012-03-21 14:51:40 +08:00
Marina Glancy
e2652f1a31 MDL-27236: Server files, improve tree view 
- Removed 'Private files' from 'Server files' repository;
- Show only non-empty directories (taking into account filetype filter);
- If there is only one non-empty filearea within a module, do not show it and skip the extra subdirectory level;
- If the user is not admin (does not have 'moodle/course:update' capability in system context), do not show course categories, just list available courses;
- Also when retrieving the course files capability to managefiles is checked before retrieving the modules list for performance tuning on sites with a lot of courses
 2012-03-21 13:55:22 +08:00
Dan Poltawski
0a4660484c Merge branch 'master_MDL-27469' of git://github.com/danmarsden/moodle 
Conflicts:
	mod/scorm/version.php
    mod/scorm/db/upgrade.php
 2012-03-21 11:38:09 +08:00
Aparup Banerjee
5599f2062c Merge branch git://github.com/phalacee/moodle.git wip-MDL-30482-master 
- resolved conflicts
 - fixed up tab --> spaces
 2012-03-21 10:50:51 +08:00
Jason Fowler
c3963fbd9b MDL-30482 - Glossary - Adding capability to other areas using glossary 2012-03-21 10:22:53 +08:00
Aparup Banerjee
d7de3f2682 Merge branch 'wip-MDL-17327-master-v2' of git://github.com/abgreeve/moodle 2012-03-21 10:02:18 +08:00
adrian@moodle.com
72d4340a0e MDL-17327 - data - improved the sql query for very large advanced searches 2012-03-21 09:41:48 +08:00
Dan Poltawski
19526d915a MDL-29515 lib/upgrade.txt: add a note about removed methods 2012-03-21 09:31:38 +08:00
Dan Poltawski
d68c62fe12 Merge branch 'w12_MDL-29515_m23_deprdb' of git://github.com/skodak/moodle 2012-03-21 09:25:47 +08:00
Sam Hemelryk
f520dcd9ba MDL-31640 course search: Coding style clean up 2012-03-21 09:49:38 +13:00
Aaron Barnes
94db27498d MDL-27469 scorm: Add extra activity completion conditions 2012-03-21 09:48:38 +13:00
Sam Hemelryk
1a381535e6 Merge branch 'wip-mdl-31640-new' of git://github.com/rajeshtaneja/moodle 2012-03-21 09:41:32 +13:00
Sam Hemelryk
333b9ac765 Merge branch 'MDL-28952-master' of git://github.com/ankitagarwal/moodle 2012-03-21 09:29:24 +13:00
Sam Hemelryk
bc4340ca9c Merge branch 'MDL-32065-master-1' of git://git.luns.net.uk/moodle 2012-03-21 09:24:58 +13:00
Sam Hemelryk
23dfb50687 Merge branch 'w12_MDL-32094_integration_fix' of git://github.com/skodak/moodle 2012-03-21 09:20:29 +13:00
Rossiani Wijaya
e053583fc7 MDL-31266 Lesson module: Improve feedback so that the responses are concatenated instead of overwritten 2012-03-20 21:56:18 +08:00
Rossiani Wijaya
49ef5d4c7f MDL-31775 Lesson Module: fixed start at last page seen bug 2012-03-20 17:32:58 +08:00
Dan Poltawski
149da7724b Merge branch 'w12_MDL-29894_m23_objectparams' of git://github.com/skodak/moodle 2012-03-20 16:40:28 +08:00
Petr Skoda
c2daa41a2e MDL-32094 fix duration test 2012-03-20 09:22:29 +01:00
Aparup Banerjee
0e5c50e29a MDL-29848 glossary: fixed whitespace 2012-03-20 16:12:02 +08:00
Aparup Banerjee
aa4edcf614 Merge branch 'MDL-29848-master' of https://github.com/mackensen/moodle 2012-03-20 16:06:40 +08:00
Aparup Banerjee
7d2b2e808f Merge branch 'MDL-31818_grader_paging' of git://github.com/andyjdavis/moodle 2012-03-20 13:20:03 +08:00
Sam Hemelryk
ef844d0a15 Merge branch 'w12_MDL-32094_m23_phpstrict' of git://github.com/skodak/moodle 2012-03-20 16:47:17 +13:00
Sam Hemelryk
0ca579f2cd MDL-11047 mod_quiz: bumped version in upgrade after conflict resolution 2012-03-20 16:46:19 +13:00
Ankit Agarwal
efd6defecb MDL-28592 blocks: changing the arguments to moodle_url::out() 2012-03-20 10:57:12 +08:00
Aparup Banerjee
b36135b66a Merge branch 'wip-MDL-31528-m23' of git://github.com/samhemelryk/moodle 2012-03-20 10:09:43 +08:00
Sam Hemelryk
270bdf5265 Merge branch 'MDL-11047' of git://github.com/mackensen/moodle 
Conflicts:
	mod/quiz/version.php
 2012-03-20 14:04:04 +13:00
Sam Hemelryk
62cf6937f6 Merge branch 'wip-MDL-32037-master' of git://github.com/marinaglancy/moodle 2012-03-20 13:33:30 +13:00