mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
52,075 Commits 36 Branches 519 Tags
Commit Graph

52075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sam Hemelryk
9340d834f3 Merge branch 'w12_MDL-32050_m23_minify' of git://github.com/skodak/moodle 2012-03-20 12:50:21 +13:00
Sam Hemelryk
e2edc82058 Merge branch 'w12_MDL-32043_m23_webserver' of git://github.com/skodak/moodle 2012-03-20 12:12:44 +13:00
Sam Hemelryk
f40400b91e Merge branch 'w12_MDL-32045_m23_resetnorole' of git://github.com/skodak/moodle 2012-03-20 12:06:07 +13:00
Sam Hemelryk
ef3b34ccc7 Merge branch 'w12_MDL-32052_m23_authtype' of git://github.com/skodak/moodle 2012-03-20 12:02:05 +13:00
Sam Hemelryk
fab344f54b Merge branch 'w12_MDL-32071_m23_dbfamily' of git://github.com/skodak/moodle 2012-03-20 11:46:00 +13:00
Sam Hemelryk
b896c12bca Merge branch 'w12_MDL-32079_m23_folderrev' of git://github.com/skodak/moodle 2012-03-20 11:34:21 +13:00
M Kassaei
e6208ec604 MDL-32053 question: Question bank table displayed inconsistently 2012-03-20 11:00:16 +13:00
M Kassaei
d1a80dd2b2 MDL-32048 mod_quiz: Question bank select/deselect all shows strange behaviour in IE 2012-03-20 10:55:01 +13:00
Sam Hemelryk
f7dbc2814c Merge branch 'MDL-32064' of git://github.com/timhunt/moodle 2012-03-20 10:37:38 +13:00
Sam Hemelryk
6f3570ffec MDL-19125 upgrade: Fixed assignment typo 2012-03-20 10:34:30 +13:00
Sam Hemelryk
2525cee573 Merge branch 'MDL-32084_master' of git://github.com/lazydaisy/moodle 2012-03-19 20:38:28 +13:00
Sam Hemelryk
b31865ce2a Merge branch 'w12_MDL-32090_m23_groupui' of git://github.com/skodak/moodle 2012-03-19 20:33:48 +13:00
Sam Hemelryk
ae89dd8de9 Merge branch 'w12_MDL-32046_m23_lastdbuser' of git://github.com/skodak/moodle 2012-03-19 20:29:39 +13:00
Petr Skoda
0f75e1e627 MDL-27553 admin: Fixed override bug 2012-03-19 20:21:33 +13:00
Sam Hemelryk
2cd97ff3c5 Merge branch 'w12_MDL-31703_m23_rootdirroot' of git://github.com/skodak/moodle 2012-03-19 20:16:34 +13:00
Rajesh Taneja
fdfe706489 MDL-31640 course: removed extra error message, perpage is set properly, modulelink hidden field, and new context call is used. 2012-03-19 15:15:06 +08:00
Sam Hemelryk
47def74bb8 Merge branch 'wip-mdl-26674' of git://github.com/rajeshtaneja/moodle 2012-03-19 20:06:40 +13:00
Sam Hemelryk
96e7855298 MDL-31528 navigation: Fixed up missing break and optimised category.php 2012-03-19 19:32:15 +13:00
Sam Hemelryk
11c0eccee4 MDL-31984 Fixed whitespace during integration 2012-03-19 19:12:40 +13:00
Brian Jorgensen
6fc267a07d MDL-31984: add debugging message if theme renderer file is missnamed 2012-03-19 19:12:39 +13:00
Rajesh Taneja
506cbfd749 MDL-31640 course: Move to, edit and search functionality in search.php is fixed with proper permission check 2012-03-19 12:02:02 +08:00
Rajesh Taneja
476aea8d8b MDL-26674 wiki2.0: cleaned wiki event logging patch 2012-03-19 11:15:06 +08:00
Sam Hemelryk
f359fd6fcc Merge branch 'wip-MDL-27064-master' of git://github.com/phalacee/moodle 2012-03-19 15:49:05 +13:00