59306 Commits

Author SHA1 Message Date
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
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
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
Jason Fowler
8afb9b7c4f MDL-35816 - User - Modify the profile page to use semantic HTML rather than tables for layout 2013-02-22 13:59:49 +08:00
Jason Fowler
34348b2b43 MDL-30072 - Notes, Webservices - adding Webservices for notes 2013-02-22 13:58:11 +08:00
David Monllao
7f9d8045a3 MDL-38164 behat: No switch completely if it is false 2013-02-22 12:01:52 +08:00
Damyon Wiese
f29e62cb6c weekly release 2.5dev 2013-02-22 10:55:48 +08:00
Damyon Wiese
41af3cb32c Fix permissions 2013-02-22 10:53:47 +08:00
Damyon Wiese
d08e6c31fb MDL-38061 Assignment - Use $CFG->showuseridentity to add extra fields to the assignment grading table/user summary. 2013-02-22 10:30:56 +08:00
kordan
6e7eca1d7f MDL-38052 theme_formal_white: allowed the overlap between headermenu and header logo 2013-02-21 18:11:32 +01:00
Dan Poltawski
fc7d3fdc84 Merge branch 'MDL-33996-forum-advanced-timestamp' of git://github.com/mudrd8mz/moodle 2013-02-21 22:11:37 +08:00
David Mudrák
15f83171f5 MDL-33996 Remove the nopostscontaining string from the forum module
After Mark's improvements at the search results display page, the string
is not needed any more.
2013-02-21 14:50:15 +01:00
Mark Johnson
b74c9a9fec MDL-33996 Forum search. Stop displaying raw search strings to users 2013-02-21 14:48:56 +01:00
Damyon Wiese
0b352fd94e MDL-37770 Assignment submission comments do not work without javascript.
This is mostly fixed by MDL-36832 which correctly sets the $PAGE->url.

This patch hides the submit and textareas from submission comments in the grading table when
javascript is disabled and quickgrading is enabled. This particular combination results in a form
nested in a form which does not work (and cannot be fixed in a reasonable amount of time).
2013-02-21 11:55:24 +08:00
Damyon Wiese
c211409998 MDL-36832 Assignment Fix issues found by unit tests with previous patch 2013-02-21 11:22:06 +08:00
Damyon Wiese
d04557b364 MDL-36832 Assignment - Use MUC for caching the useridlist and change all pages to redirect after post.
This means that the $PAGE->url is properly set for all pages and is required to fix some edge cases with the comments api when
javascript is disabled. It also means logging in after a timeout will work nicely and other Good Things (tm).
2013-02-21 11:04:07 +08:00
Dan Poltawski
72c70f9d14 Merge branch 'MDL-37997-muc-stats-display' of git://github.com/mudrd8mz/moodle 2013-02-21 09:38:05 +08:00
Sam Hemelryk
1727057218 MDL-37224 backup-import: better handling of search button 2013-02-21 08:23:58 +13:00
David Mudrák
24798e5df5 MDL-37997 Yet more CSS improvements to display MUC caches usage 2013-02-20 17:00:57 +01:00
Dan Poltawski
d94fc7ece9 Revert "MDL-36380 stats: No more duplicated entries when viewing monthly stats"
This reverts commit 304baba01a8c1de6bf32f98f7c188e12b72a9a99.
2013-02-20 17:04:33 +08:00
Dan Poltawski
aa247695e7 Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle 2013-02-20 14:27:27 +08:00
Rajesh Taneja
0627e1cef4 MDL-37329 Navigation: Enrolled courses in category should be added only. 2013-02-20 12:39:21 +08:00
Frederic Massart
5961512aa3 MDL-35622 files: Fixed typo in galleryitem extension 2013-02-20 12:23:18 +08:00
Damyon Wiese
cfd2addf3f Merge branch 'wip-mdl-37329-new' of git://github.com/rajeshtaneja/moodle 2013-02-20 08:54:57 +08:00
Eloy Lafuente (stronk7)
3b00c13bf1 MDL-37894 Amend tests with new openclose rule. 2013-02-20 01:36:20 +01:00