moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61711 commits 37 branches 540 tags 1.3 GiB
Commit graph

61711 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Hemelryk
111f5291f9 Merge branch 'wip-MDL-39608-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-06-10 14:26:04 +12:00
AMOS bot
19c01c7a80 Automatically generated installer lang files 2013-06-10 00:39:08 +00:00
Sam Hemelryk
fb8010732e Merge branch 'MDL-36090_log2' of git://github.com/andyjdavis/moodle 2013-06-10 12:31:03 +12:00
Sam Hemelryk
2c0fb4c788 Merge branch 'wip-MDL-40088-master' of git://github.com/marinaglancy/moodle 2013-06-10 12:14:17 +12:00
Sam Hemelryk
e559265c10 Merge branch 'wip-MDL-39227-master' of git://github.com/phalacee/moodle 2013-06-10 11:43:31 +12:00
Sam Hemelryk
a6d966885b Merge branch 'MDL-39979-master' of git://github.com/FMCorz/moodle 2013-06-10 11:35:26 +12:00
Sam Hemelryk
1878661402 MDL-40100 cache: removed unneeded includes from add instance forms 2013-06-10 10:23:28 +12:00
Sam Hemelryk
d3e5a21e7a MDL-39824 theme: changes recorded in theme/upgrade.txt 2013-06-10 09:26:05 +12:00
Sam Hemelryk
a2f8bccf0a MDL-39824 output: fixed bug when moving blocks with rtl lang 2013-06-10 09:10:06 +12:00
Sam Hemelryk
7956a02fda MDL-40089 theme_clean: simplified layouts and converted to new OUTPUT API 2013-06-10 09:09:03 +12:00
Matteo Scaramuccia
06eca48648 MDL-40002 Files: ETag value must be a quoted-string. 
ETag value must be double quoted, http://tools.ietf.org/html/rfc2616#section-3.11.
More details about potential impacts in MDL-39832: shortly, at least when using
HTTP Partial GET Requests (HTTP Status: 206) plus X-Sendfile HTTP Header.
In this commit, the impact is to be RFC2616 compliant when using the ETag Header.
 2013-06-09 09:43:36 +02:00
Gareth J Barnard
70d7e9141f MDL-39798 theme_bootstrapbase: Improve layout for course participation reports. 2013-06-08 13:59:15 +01:00
Damyon Wiese
06b9df1145 MDL-37490 Assign: Minor patch cleanup 
Bump version number for mod_assign
Remove use of global $OUTPUT (can use get_renderer() in assign)
Fix language strings
Add missing setTypes
 2013-06-08 10:44:52 +01:00
Gareth J Barnard
ef8a6dfb33 MDL-37490 mod_assign: Add setting to show the due date on the course page. 2013-06-08 10:44:28 +01:00
Petr Škoda
66056f994f MDL-39096 fix obfuscate_text() utf-8 compatibility 2013-06-07 22:38:48 +02:00
Petr Škoda
0fa01f4e60 MDL-39549 fix cohort search in course categories 2013-06-07 22:07:15 +02:00
Petr Škoda
8d4f13666b MDL-37974 fix verbose output when expiring manual enrolments 2013-06-07 21:18:54 +02:00
MorrisR2
80f1c6adc0 MDL-37974 add "Disable course enrolment" expiration action for manual enrolments 
Commit amended by Petr Skoda to match recommended coding style.
 2013-06-07 21:06:47 +02:00
Gareth J Barnard
3355b72e3b MDL-40087 theme_bootstrapbase: Turn editing on button misaligned on nav bar. 2013-06-07 18:20:05 +01:00
Tim Hunt
c2c6af946c MDL-22390 autolink filter: handle URLs in brackets better. 
This breaks some legitimate URLs like
http://en.wikipedia.org/wiki/Slash_(punctuation).
This is a necessary trade-off. Many other web systems do not handle that
case correctly either. The work-around it so escape the ) as %29.

This commit also improves the way the unit tests for this work.

It also fixes a couple of other tricky cases that were spotted in
the forums while this was being discussed. See the new test cases.
 2013-06-07 10:40:37 +01:00
Petr Škoda
4b75f49a63 MDL-28394 fix enrolment method restore logic 
This patch fixes:
* missing enrolment methods after 1.9 backup restore - defaults are added
* enrolment methods are restored only when users option is enabled
* manual enrolment override option is disabled if users not available
 2013-06-07 10:02:59 +02:00
Petr Škoda
f815e4cbdf MDL-32480 allow external https links in IMSCP too 2013-06-07 09:58:03 +02:00
Nicolas Dunand
4a04fef6ef MDL-32480 fix display of IMS content packages with external links 2013-06-07 09:58:03 +02:00
Jason Fowler
41d6483066 MDL-39746 - Themes - Hiding the user picture on the forum page when the screensize is too small to allow for it 2013-06-07 14:35:08 +08:00
Dan Poltawski
53717b2194 MDL-32533 tool_customlang: don't use h3 for notification 
Thanks to Juho Viitasalo for the suggestion.
 2013-06-07 14:06:33 +08:00
Sam Hemelryk
7362d8160a MDL-40089 theme_clean: moved general to columns3.php as prep 2013-06-07 17:33:14 +12:00
Sam Hemelryk
018721e685 MDL-39842 js: fixed block drag and drop 2013-06-07 17:33:14 +12:00
Sam Hemelryk
8bfd530bc1 MDL-39824 theme_bootstrapbase: converted $PAGE use to new $OUTPUT methods. 2013-06-07 17:32:44 +12:00
Sam Hemelryk
28700dea3c MDL-40089 theme_bootstrapbase: moved general to columns3.php as prep 2013-06-07 17:32:06 +12:00
Sam Hemelryk
06a72e0192 MDL-39824 output: tidied up output before bootstrap cleaning 2013-06-07 17:31:59 +12:00
Sam Hemelryk
b8035316bb MDL-39839 renderer: new methods for calls appearing in theme layouts 2013-06-07 17:31:27 +12:00
Sam Hemelryk
3707972a78 MDL-39838 renderer: new methods for body classes and id 2013-06-07 17:31:27 +12:00
Sam Hemelryk
8cf2b9ab9b MDL-39841 renderer: new method to renderer blocks with predictable structure 2013-06-07 17:31:27 +12:00
Sam Hemelryk
36b77e3a88 MDL-39871 themes: can now specify regions to swap when using rtl langs 2013-06-07 17:31:27 +12:00
Marina Glancy
9f370860a4 MDL-40088 fixed bug with not visible course section 2013-06-07 13:55:19 +10:00
Dan Marsden
d32f3eeba8 MDL-37968 course_overview: add dim class to hidden courses for teachers. 2013-06-07 14:38:13 +12:00
Mary Evans
f84ad1bb0a MDL-39338 core_question: Make history box a .well 2013-06-06 22:49:27 +01:00
Matteo Scaramuccia
9ab37ae3e0 MDL-39832 Files: Fixed ETag format according with RFC2616. 
ETag must be double quoted,
http://tools.ietf.org/html/rfc2616#section-3.11:

      entity-tag = [ weak ] opaque-tag
      weak       = "W/"
      opaque-tag = quoted-string
 2013-06-06 23:14:44 +02:00
Matteo Scaramuccia
3960c00e3c MDL-39832 Files: Revert MDL-39688 commit, f111746140 
MDL-39688 has been successful in providing a solution for the issue but further
investigations done in MDL-39832 have got the evidence that the given solution
is more likely a workaround.
 2013-06-06 23:14:42 +02:00
Oleg Sychev
0b287dd2e8 MDL-40013 Easier to override saving question hints 
This adds 3 new methods, called from question_type::save_hints,
to make it easier for different question types to overload this
functionality without duplicating code.

Question types that will benefit from this change include
oumultiresponse, ddmarker, preg and correctwriting.
 2013-06-06 19:58:42 +03:00
David Mudrák
f3fd0eebb5 MDL-40080 Remove unused strings from the core_hub subsystem 2013-06-06 12:44:13 +02:00
Frederic Massart
d36dd9eb57 MDL-39979 navigation: Remove the use of an undefined variable 2013-06-06 14:52:49 +08:00
Dan Poltawski
12313d6125 MDL-26925 User selector: Set label when no results 
Thanks to Jonathon Fowler for the fix!
 2013-06-06 14:07:27 +08:00
Dan Poltawski
b3be471f52 weekly on-sync release 2.6dev 2013-06-06 11:58:39 +08:00
Dan Poltawski
348cebac1c Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-06-06 11:54:47 +08:00
Dan Poltawski
d139e46447 MDL-25901 rss: do not copyright html tag 
They copyright field does not permit html, it should be plain text
 2013-06-06 11:21:19 +08:00
Eloy Lafuente (stronk7)
b21a6e26fa Merge branch 'wip-MDL-38773-master' of git://github.com/marinaglancy/moodle 2013-06-05 19:31:53 +02:00
Eloy Lafuente (stronk7)
33a54457ca Merge branch 'w23_MDL-39588_m26_ociinstall' of git://github.com/skodak/moodle 2013-06-05 16:22:58 +02:00
Eloy Lafuente (stronk7)
cd8e9b19c5 Merge branch 'w23_MDL-39503_m26_signup' of git://github.com/skodak/moodle 2013-06-05 16:10:39 +02:00
Eloy Lafuente (stronk7)
6c1c8b8ce0 Merge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle 2013-06-05 10:36:16 +02:00