mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
69,345 Commits 36 Branches 519 Tags
Commit Graph

69345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simey Lameze
71ec01afa6 MDL-46753 auth_cas: Replace hardcoded logout_return_url to user defined URL. 
Credit goes to Mitsuru Udagawa, thanks!
 2014-08-18 12:51:44 +08:00
Marina Glancy
e1eb180806 weekly release 2.8dev 2014-08-14 14:52:07 +08:00
Marina Glancy
7d90b9b9f9 NOBUG: Fixed file access permissions 2014-08-14 14:52:07 +08:00
Marina Glancy
39db49c237 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-08-14 14:52:01 +08:00
Eloy Lafuente (stronk7)
3376dae082 MDL-45031 theme: fix tabs base line alignment by 1px. 
Credit goes to Damyon Wiese, thanks!
 2014-08-13 21:31:11 +02:00
AMOS bot
49913cbda9 Automatically generated installer lang files 2014-08-14 00:05:40 +08:00
Eloy Lafuente (stronk7)
ccef4eec67 Merge branch 'MDL-45932-fixes' of git://github.com/danpoltawski/moodle 2014-08-13 12:03:17 +02:00
Dan Poltawski
aa53347409 MDL-45932 enrol_imsenterprise: lang string fixes 2014-08-13 10:35:52 +01:00
Marina Glancy
a2a4ad8928 MDL-46643 calendar: improved tab order of calendar detail pages 2014-08-13 16:29:45 +08:00
Marina Glancy
fa386d6172 Merge branch 'MDL-45759-master-2' of git://github.com/andrewnicols/moodle 2014-08-13 16:23:12 +08:00
Andrew Nicols
5afbca2485 MDL-45759 mod_quiz: Correct behat test to reflect changes from a translation fix 2014-08-13 15:44:52 +08:00
Dan Poltawski
60127c84b5 Revert "Merge branch 'wip_MDL-46660_m28_memcache' of https://github.com/skodak/moodle" 
This reverts commit 57fdca8cec16f0018537cca9e07581cca601876f, reversing
changes made to 62e30bfbcd14772aa1c2f7ffe990e4b609098549.
 2014-08-13 08:36:44 +01:00
Marina Glancy
38a5c6861e Merge branch 'MDL-46565_master' of git://github.com/markn86/moodle 2014-08-13 09:25:38 +08:00
Eloy Lafuente (stronk7)
179eb9cabd Merge branch 'MDL-46697' of git://github.com/aolley/moodle 2014-08-13 02:08:07 +02:00
Eloy Lafuente (stronk7)
9ab115bbee Merge branch 'MDL-45031_M28' of git://github.com/lazydaisy/moodle 2014-08-13 00:34:03 +02:00
Eloy Lafuente (stronk7)
b8475d375c Merge branch 'wip-MDL-46470-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-08-13 00:24:51 +02:00
Mark Nelson
67ab0ff089 MDL-46565 gradereport_*: moved report viewed event to bottom of page 2014-08-12 12:27:50 -07:00
Mark Nelson
44263d9c1c MDL-46565 gradereport_*: renamed event string names 
This makes the strings more descriptive and consistent.

AMOS START
  MOV [eventreportviewed, gradereport_grader],[eventgradereportviewed, gradereport_grader]
  MOV [eventreportviewed, gradereport_outcomes],[eventgradereportviewed, gradereport_outcomes]
  MOV [eventreportviewed, gradereport_overview],[eventgradereportviewed, gradereport_overview]
  MOV [eventreportviewed, gradereport_user],[eventgradereportviewed, gradereport_user]
AMOS END
 2014-08-12 12:19:18 -07:00
Dan Poltawski
023d758513 Merge branch 'wip_MDL-46561_m28_sessexists' of https://github.com/skodak/moodle 2014-08-12 14:28:22 +01:00
Dan Poltawski
231520807e Merge branch 'MDL-37401' of git://github.com/nobelium/moodle 2014-08-12 13:58:38 +01:00
Dan Poltawski
70c16c5336 Merge branch 'MDL-45642' of git://github.com/timhunt/moodle 2014-08-12 11:34:05 +01:00
Dan Poltawski
134b1e4c90 Merge branch 'MDL-43824-master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-08-12 11:06:53 +01:00
Dan Poltawski
57fdca8cec Merge branch 'wip_MDL-46660_m28_memcache' of https://github.com/skodak/moodle 2014-08-12 11:04:15 +01:00
Dan Poltawski
62e30bfbcd Merge branch 'master_MDL-46718' of https://github.com/greg-or/moodle-mod_assign 2014-08-12 11:02:18 +01:00
Marina Glancy
3cef86a42b Merge branch 'MDL-46308' of git://github.com/timhunt/moodle 2014-08-12 16:02:41 +08:00
Marina Glancy
dc0f4b4f26 Merge branch 'MDL-21042_master' of git://github.com/markn86/moodle 2014-08-12 16:01:56 +08:00
Marina Glancy
2e6188a7f2 Merge branch 'MDL-46448_rating_ajax2' of git://github.com/andyjdavis/moodle 2014-08-12 15:22:19 +08:00
Marina Glancy
49b9144c87 Merge branch 'm28_MDL-46315' of git://github.com/totara/moodle 2014-08-12 15:01:30 +08:00
Marina Glancy
e12ffe254e Merge branch 'MDL-46600_import_failed' of git://github.com/andyjdavis/moodle 2014-08-12 15:01:19 +08:00
Marina Glancy
7c27c681b1 Merge branch 'wip_MDL-46480_m28_footernan' of git://github.com/skodak/moodle 2014-08-12 15:01:10 +08:00
Marina Glancy
44c2bafc1f Merge branch 'MDL-46646-master' of git://github.com/andrewnicols/moodle 2014-08-12 13:32:33 +08:00
Marina Glancy
ff195da1e3 Merge branch 'm28_MDL-46643' of git://github.com/totara/moodle 2014-08-12 13:31:25 +08:00
Marina Glancy
36e2b86dd3 Merge branch 'MDL-43740_manual_none' of git://github.com/andyjdavis/moodle 2014-08-12 13:29:15 +08:00
Andrew Nicols
b21b32a4af MDL-46646 gradebook: Optimise generation of the grader report table 
The grader report table makes use of various user preferences, and strings
which on every iteration. On a large gradebook, this can have a significant
impact upon performance.
The table also uses html_writer::tag to generate spans for
machine-generated content which becomes expensive on larger gradebooks.
 2014-08-12 11:56:42 +08:00
Mary Evans
0b181e9a4d MDL-45031 theme_base: Added style/tabs.css and updated config.php 
also removed tabtree css from style/core.css to style/tabs.css.
 2014-08-12 00:59:16 +01:00
Eloy Lafuente (stronk7)
f414c5aa9e Merge branch 'MDL-46646_master' of https://github.com/Syxton/moodle 2014-08-12 01:53:23 +02:00
Eloy Lafuente (stronk7)
27e7715141 Merge branch 'MDL-46676_master' of https://github.com/ikawhero/moodle 2014-08-12 01:48:10 +02:00
Eloy Lafuente (stronk7)
0bf7e11a04 Merge branch 'MDL-46681' of git://github.com/timhunt/moodle 2014-08-12 01:44:13 +02:00
Mary Evans
6f0bab6888 MDL-43824 core/grade/report/grader: Fix for misalignment of static rows with scale grades. 2014-08-11 23:40:46 +01:00
Dan Poltawski
c7a042bfcf Merge branch 'master_MDL-46524' of https://github.com/greg-or/moodle-mod_assign 2014-08-11 17:06:54 +01:00
Dan Poltawski
2f035def0f Merge branch 'MDL-45932-master' of https://github.com/StudiUM/moodle 2014-08-11 16:53:51 +01:00
Dan Poltawski
c068b0814b Merge branch 'MDL-46496-master' of git://github.com/andrewnicols/moodle 2014-08-11 14:38:33 +01:00
Dan Poltawski
d3014cca39 Merge branch 'master_MDL-44015' of https://github.com/greg-or/moodle-mod_assign 2014-08-11 14:31:02 +01:00
Dan Poltawski
c5186b2251 Merge branch 'MDL-46688' of git://github.com/timhunt/moodle 2014-08-11 14:13:12 +01:00
Andrew Davis
93dbb21841 MDL-43740 core_grade: Thanks for Robert Russo for the patch. Removed the ability to set manual grade items to grade type "None" 2014-08-11 20:15:00 +08:00
Dan Poltawski
463d281377 Merge branch 'MDL-45759-master' of git://github.com/andrewnicols/moodle 2014-08-11 11:24:19 +01:00
Dan Poltawski
0bd41a9ccf Merge branch 'wip-MDL-30668-master' of git://github.com/marinaglancy/moodle 2014-08-11 10:41:40 +01:00
Marina Glancy
e4c2a25866 Merge branch 'wip_MDL-46692_m28_forum' of git://github.com/skodak/moodle 2014-08-11 17:24:19 +08:00
Marina Glancy
b832dde880 Merge branch 'MDL-35984-master' of git://github.com/damyon/moodle 2014-08-11 17:22:13 +08:00
Damyon Wiese
d6caf63789 MDL-35984 Grades: Fix deprecation of grade_category::aggregate_values 2014-08-11 15:53:47 +08:00