mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 16:10:15 +01:00
Code Issues Projects Releases Wiki Activity
59,339 Commits 36 Branches 527 Tags
Commit Graph

59339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
b672408a1a Merge branch 'MDL-37792-master' of git://github.com/sammarshallou/moodle 2013-02-26 10:45:21 +08:00
Sam Hemelryk
07ccb35731 Merge branch 'wip-MDL-38144-master' of git://github.com/marinaglancy/moodle 2013-02-26 15:43:26 +13:00
Dan Poltawski
84f72e28fd Merge branch 'MDL-38161' of git://github.com/stronk7/moodle 2013-02-26 10:40:51 +08:00
Dan Poltawski
e7054f06e3 MDL-37455 - redirect for mod_folder course breaking changes 2013-02-26 10:06:29 +08:00
Eloy Lafuente (stronk7)
fd6e1aaadb Merge branch 'wip-MDL-38162-m25' of git://github.com/samhemelryk/moodle 2013-02-26 01:28:56 +01:00
Eloy Lafuente (stronk7)
64870338c4 Merge branch 'w08_MDL-37963_m25_usergen' of git://github.com/skodak/moodle 2013-02-26 01:25:58 +01:00
Eloy Lafuente (stronk7)
b1ed9f6970 Merge branch 'MDL-38141-m' of git://github.com/andrewnicols/moodle 2013-02-26 01:19:29 +01:00
Eloy Lafuente (stronk7)
c45593c6d8 Merge branch 'wip-MDL-38110-m25' of git://github.com/samhemelryk/moodle 2013-02-26 00:48:22 +01:00
Eloy Lafuente (stronk7)
1e171d4d37 Merge branch 'MDL-38090-m' of git://github.com/andrewnicols/moodle 2013-02-26 00:33:32 +01:00
Eloy Lafuente (stronk7)
2a80528fd6 Merge branch 'wip-MDL-38146-master' of git://github.com/marinaglancy/moodle 2013-02-25 23:52:20 +01:00
Eloy Lafuente (stronk7)
8615b484b2 Merge branch 'MDL-38001-master' of git://github.com/mouneyrac/moodle 2013-02-25 23:51:20 +01:00
Eloy Lafuente (stronk7)
05fc7ccc82 Merge branch 'MDL-30098_master' of git://github.com/markn86/moodle 
Conflicts:
	course/tests/externallib_test.php
 2013-02-25 23:38:20 +01:00
sam marshall
6fea7a5f02 MDL-37792 Conditions: Interests condition offered but not implemented 2013-02-25 13:19:56 +00:00
Damyon Wiese
a3e57810c6 Merge branch 'wip-MDL-36287-m25' of git://github.com/samhemelryk/moodle 2013-02-25 15:49:13 +08:00
Damyon Wiese
fffb9bbe64 Merge branch 'wip-MDL-38145-master' of git://github.com/marinaglancy/moodle 2013-02-25 15:42:13 +08:00
Dan Poltawski
2b32b2eea0 Merge branch 'wip-MDL-38163-m25' of git://github.com/samhemelryk/moodle 2013-02-25 15:39:30 +08:00
Damyon Wiese
a4a30222a0 MDL-37641 Version number bump for js changes. 2013-02-25 15:25:01 +08:00
Damyon Wiese
61725199a9 Merge branch 'MDL-37641-master' of git://github.com/FMCorz/moodle 2013-02-25 15:23:19 +08:00
Dan Poltawski
bbd045b9e6 Merge branch 'w08_MDL-38121_m25_plugincheck' of git://github.com/skodak/moodle 2013-02-25 14:34:07 +08:00
Dan Poltawski
f4e34c5ffb Merge branch 'MDL-37770-master' of git://github.com/damyon/moodle 2013-02-25 14:32:01 +08:00
Dan Poltawski
e1350c61d1 Merge branch 'MDL-36832-master' of git://github.com/damyon/moodle 2013-02-25 14:19:36 +08:00
Damyon Wiese
44c3f54c92 Merge branch 'wip-MDL-35875-master' of git://github.com/phalacee/moodle 2013-02-25 14:09:33 +08:00
Damyon Wiese
713b75916c MDL-28692 Base theme - Version bump for css change 2013-02-25 13:50:01 +08:00
Damyon Wiese
c7cb130bce Merge branch 'MDL-28692_master' of git://github.com/lazydaisy/moodle 2013-02-25 13:32:25 +08:00
Damyon Wiese
ac57ce753c MDL-30072 Notes webservices - Fix one parameter description and bump version. 2013-02-25 13:14:18 +08:00
Damyon Wiese
cc7a1c8916 Merge branch 'wip-MDL-30072-master' of git://github.com/phalacee/moodle 2013-02-25 12:37:56 +08:00
Damyon Wiese
7e6c674302 MDL-33934 MyMobile theme - Fix white space, indenting and file permissions 2013-02-25 12:24:55 +08:00
Damyon Wiese
23f7fed1e1 Merge branch 'MDL-33934_master' of git://github.com/lazydaisy/moodle 2013-02-25 12:10:06 +08:00
Dan Poltawski
b5457b4def MDL-37455 lang - fix trailing whitespace 2013-02-25 12:05:16 +08:00
Dan Poltawski
92adcc1cf0 Merge branch 'wip-MDL-37455-master' of git://github.com/marinaglancy/moodle 2013-02-25 11:43:48 +08:00
Damyon Wiese
b625f85949 Merge branch 'MDL-38052_master' of git://github.com/kordan/moodle 2013-02-25 11:38:13 +08:00
Tim Lock
9ecded01cc MDL-38113: Blind Marking grader email reveals submitters details 2013-02-25 11:13:25 +08:00
Dan Poltawski
24ace4b795 Merge branch 'wip-MDL-38091-master' of git://github.com/marinaglancy/moodle 2013-02-25 11:00:03 +08:00
Damyon Wiese
dbfe8e26ee Merge branch 'w08_MDL-38042_m25_flatroles' of git://github.com/skodak/moodle 2013-02-25 10:50:38 +08:00
Damyon Wiese
89fcdca119 Merge branch 'w08_MDL-38096_m25_manenrol' of git://github.com/skodak/moodle 2013-02-25 10:44:54 +08:00
Dan Poltawski
5f0aeea1ce Merge branch 'MDL-38164_master' of git://github.com/dmonllao/moodle 2013-02-25 10:43:52 +08:00
Dan Poltawski
1343f4c02b Merge branch 'MDL-38061-master' of git://github.com/damyon/moodle 2013-02-25 10:16:29 +08:00
Petr Škoda
ce9d54b9f3 MDL-38096 use separate manual enrol and unenrol capabilities in UI 2013-02-24 13:28:48 +01:00
Petr Škoda
f10edc9792 MDL-37963 do request flatfile role mapping when adding new roles 2013-02-24 12:17:16 +01:00
Petr Škoda
dbf60a042c MDL-37963 hash only given passwords in user generator 2013-02-24 10:40:55 +01:00
Petr Škoda
bdbcb6d7fa MDL-38121 tell admins when plugin installed into wrong dir 2013-02-23 18:16:42 +01:00
Mary Evans
c443c95c01 MDL-33934 theme_mymobile: Updates to CSS & Javascript - including MDL-38072 removing css/js for collapsed topic. 
The following comments is a mash of commits for reference only:

Squashed commit of the following:

commit a6ab42de71e41c0760d6d99dec7a3ec6ef8b7e52
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sat Feb 23 15:34:12 2013 +0000

    MDL-33934 theme_mymobile: fixing whitspace and undoing some previous confict changes fixing where broken.

commit a5abe86fad012f2face9dbd98826583499f46b88
Merge: 89c04c2 13c3ee1
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sat Feb 23 15:18:17 2013 +0000

    Merge branch 'wip-MDL-33934_master' of github.com:lazydaisy/moodle into wip-MDL-33934_master

    Conflicts:
        theme/mymobile/javascript/custom.js
        theme/mymobile/style/core.css

commit 89c04c2bee75938ba5e6f6b54f43ff866c6119b6
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sat Feb 23 15:01:43 2013 +0000

    MDL-33934 theme_mymobile: Removed collapsed topic contributed plugin css/js from style/core.css & javascript/custom.js

commit ddee12ebd2083af0ebebd747e867957d46a10af7
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Feb 19 11:05:35 2013 +0000

    MDL-33934 theme-mymobile: un-commenting $(document).ready(function() in javascript/custom.js.

commit 365bb2d9772f9fd2cb55139f728fa9611dac7b4d
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sun Feb 17 17:41:47 2013 +0000

    MDL-33934 theme_mymobile: updates to javascript and css

commit 13c3ee133945ce0e2a55dd54e0c8b8e2a35f76c5
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Feb 19 11:05:35 2013 +0000

    MDL-33934 theme-mymobile: un-commenting $(document).ready(function() in javascript/custom.js.

commit c9e626adf810e3d8d3f776b99d648017033fdb39
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sun Feb 17 17:41:47 2013 +0000

    MDL-33934 theme_mymobile: updates to javascript and css
 2013-02-23 15:46:05 +00:00
Marina Glancy
f0b137c5b8 MDL-38146 fixing navigation when adding/editing course category 2013-02-23 12:06:56 +11:00
Marina Glancy
592f476b02 MDL-38145 conditionlib_test calls API functions to create course and category 2013-02-23 12:06:47 +11:00
Marina Glancy
db1eed7012 MDL-38144 categories are created in reverse sort order in externallib 2013-02-23 12:06:39 +11:00
Marina Glancy
898d4975cb MDL-38091 fixed bug with SQL query on Oracle 2013-02-23 12:06:21 +11:00
Marina Glancy
c553530a8e MDL-37455 mod_folder can display content inline. Coding style corrections 2013-02-23 12:03:58 +11:00
Marina Glancy
ec62d8b4e5 MDL-37455 Performance improvement in mod_folder 
We cache and store additional data in cm_info::customdata and do not
query DB every time the folder is displayed on a course page
 2013-02-23 12:03:58 +11:00
Marina Glancy
38199c247b MDL-37455 Allow mod_folder to display the content inline on course page instead of on separate page 2013-02-23 12:03:58 +11:00
Rex Lorenzo
334c6d805f MDL-35175 - Lesson shows no attempts if associated with a grouping 2013-02-22 12:38:01 -08:00