moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66603 commits 37 branches 544 tags 1.3 GiB
Commit graph

66603 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marina Glancy
6815afcc89 MDL-43021 course: corrections to the shortname and idnumber uniqueness validation 2014-04-03 11:07:56 +08:00
Damyon Wiese
ff34886e8f MDL-42195 Bootstrap: Make bootstrap responsive images "opt-in". 
This responsive image behaviour prevents setting of image sizes in text editors,
as well as a string of pix icon bugs / profile image bugs across Moodle.

We are switching to Bootstrap 3 syntax where you need img-responsive class to images
that want this behaviour.
 2014-04-03 09:23:27 +08:00
Damyon Wiese
82fbf80171 Merge branch 'm26_MDL-44753' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-04-02 16:35:27 +08:00
Dan Marsden
eee676dcd8 MDL-44753 SCORM: make correct selection of first sco - also fixes MDL-44896 2014-04-02 20:51:48 +13:00
Marina Glancy
e0f47ce98c Merge branch 'MDL-41063_26' of git://github.com/jmvedrine/moodle into MOODLE_26_STABLE 2014-04-02 09:46:50 +08:00
Eloy Lafuente (stronk7)
13689e7d20 Merge branch 'MDL-31262_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-04-02 03:23:42 +02:00
Marina Glancy
7b5cd3154d Merge branch 'm26_MDL-44753' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-04-02 09:16:26 +08:00
Marina Glancy
acc0d89f5b MDL-34012 chat: removing repetetive db query (performance) 2014-04-02 02:58:02 +02:00
Eloy Lafuente (stronk7)
ee21ac5333 Merge branch 'wip-MDL-43398-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-04-02 02:50:34 +02:00
Eloy Lafuente (stronk7)
001247f3c9 Merge branch 'w14_MDL-44843_m26_localedash' of https://github.com/skodak/moodle into MOODLE_26_STABLE 2014-04-02 02:23:46 +02:00
Eloy Lafuente (stronk7)
c6008a30cd Merge branch 'wip-MDL-41102-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-04-02 02:20:44 +02:00
Sam Hemelryk
d7680b1f23 Merge branch 'w14_MDL-44824_m26_subplugins' of https://github.com/skodak/moodle into MOODLE_26_STABLE 2014-04-02 13:04:52 +13:00
Dan Marsden
8fb32f86dd MDL-44753 SCORM: add check during SCORM restore to make sure valid launch sco is set 2014-04-02 10:03:40 +13:00
Sam Hemelryk
15f780a797 Merge branch 'MDL-43284-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE 2014-04-02 09:27:07 +13:00
Eloy Lafuente (stronk7)
8414fb7073 Merge branch 'wip-MDL-35305-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-04-01 21:50:23 +02:00
Michael Aherne
195a68a508 MDL-41895 conditions Show details of grouping restriction 2014-04-01 13:39:18 +01:00
Marina Glancy
4c0e7741c3 Merge branch '26STABLE-wip-MDL44021' of git://github.com/jennymgray/moodle into MOODLE_26_STABLE 2014-04-01 17:40:57 +08:00
Jenny Gray
c1fa0dce9e MDL-44021 mod_glossary - fixed search multiple keywords sql duplicate parameter error 2014-04-01 09:40:58 +01:00
Marina Glancy
0cbcd72e8f Merge branch 'W14_MDL-44862_m26_pgsocket' of git://github.com/skodak/moodle into MOODLE_26_STABLE 2014-04-01 15:33:54 +08:00
Marina Glancy
d19792d5de Merge branch 'MDL-44746_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE 2014-04-01 13:52:52 +08:00
Marina Glancy
3b7b097f2a Merge branch 'MDL-44701_26' of git://github.com/aolley/moodle into MOODLE_26_STABLE 2014-04-01 11:06:48 +08:00
Marina Glancy
1a0bc77645 Merge branch 'MDL-44670-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-01 11:05:45 +08:00
Marina Glancy
37de060263 Merge branch 'MDL-44590-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 2014-04-01 11:05:09 +08:00
Marina Glancy
b3aed4e5aa Merge branch 'MDL-44837-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE 2014-04-01 10:40:07 +08:00
Marina Glancy
ea3d172274 Merge branch 'wip_MDL-44854_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE 2014-04-01 10:37:56 +08:00
Marina Glancy
cc247afe18 Merge branch 'wip-MDL-44850_M26' of git://github.com/gjb2048/moodle into MOODLE_26_STABLE 2014-04-01 10:36:39 +08:00
sam marshall
d0434cb119 MDL-44837 Behat: 'dialogue' selector only works for confirm dialogues 
The dialogue selector in Behat (used only in one place) didn't work for
other types of standard Moodle notification dialogue.
 2014-03-31 13:50:47 +01:00
Gareth J Barnard
16b4059ca3 MDL-44854 theme: 'svg' font type not served. 2014-03-31 11:07:47 +01:00
Gareth J Barnard
5b74abc38d MDL-44850 theme: 'eot' font type not served. 2014-03-31 11:05:08 +01:00
Damyon Wiese
6d458076d5 MDL-44583 Assign: performance fixes 2014-03-31 12:53:41 +08:00
Marina Glancy
26a44fc7bb Merge branch 'MDL-44822_26' of git://github.com/aolley/moodle into MOODLE_26_STABLE 2014-03-31 12:47:14 +08:00
Eloy Lafuente (stronk7)
106f3e9ce9 MDL-44862 postgres: tests to support socket & port 
Both the database auth and enrol plugins use ADOdb
to perform connections. Socket and port are allowed
there if passed as "socket:port", so, when both are
configured in CFG, we pass them that way. Else
ADOdb defaults to standard port (5432).
 2014-03-31 09:29:53 +08:00
Jean-Michel Vedrine
081468fdb1 MDL-41063 Lesson qformat_default class is missing an error function 2014-03-30 09:22:25 +02:00
Petr Škoda
d94e9570c7 MDL-44862 always add dbport to dbsocket in pg driver 
This should hopefully resolve problems when using sockets connection
to pg servers running on non-standard ports.
 2014-03-30 10:13:08 +08:00
Mark Nelson
d27dadca87 MDL-44746 core_events: minor changes to the user_deleted event 2014-03-28 17:08:55 -07:00
Mark Nelson
12d0bf448f MDL-44746 core_events: removed incorrect use of snapshot 2014-03-28 16:55:24 -07:00
Tim Hunt
bb42f6d46f MDL-31262 fix quiz review capability check. 
This change is logically the same as changing
    $this->has_capability('mod/quiz:viewreports')
to
    $this->has_capability('mod/quiz:viewreports') || $this->has_capability('mod/quiz:preview')
in the original code. However, I rewrote the logic so that we test the
most common and performance-critical case first - that of a student
lookign at their own attempt.
 2014-03-28 18:40:07 +00:00
Marina Glancy
e0529dfbad MDL-41102 report_performance: correctly check state of automated backups 
Thanks to Renaat Debleu for the patch
 2014-03-28 16:41:24 +08:00
Marina Glancy
1e6e35e277 MDL-33486 wiki: allow searching individual wikis 2014-03-28 14:16:55 +08:00
Petr Škoda
fb3ed1a19a MDL-44843 try to hack around strict locale names in OSX 2014-03-28 11:49:15 +08:00
Marina Glancy
2877a60763 MDL-35305 wiki: backup and restore files 
Thanks to Tatsuya Shirai for the patch
 2014-03-28 10:29:20 +08:00
Marina Glancy
18b388efe7 weekly release 2.6.2+ 2014-03-27 16:52:20 +08:00
Marina Glancy
6f29595eba Merge branch 'install_26_STABLE' of git://git.moodle.org/moodle-install into MOODLE_26_STABLE 2014-03-27 16:52:19 +08:00
Marina Glancy
d654a1e6d2 MDL-43398 wiki: remove extra Choose... option from select 2014-03-27 14:57:26 +08:00
Jerome Mouneyrac
ec7de91744 MDL-43398 Wiki: Choose... options cause SQL errors or seen inappropriate. 2014-03-27 14:57:08 +08:00
Adam Olley
e4f7b38325 MDL-44701 gradereport_grader: Display warning on navigation if unsaved grades are present 2014-03-27 14:59:07 +10:30
Petr Škoda
e21117fdc0 MDL-44824 add missing subplugin type names 2014-03-27 11:47:51 +08:00
Petr Škoda
60b1e67bae MDL-44824 add missing subplugin type names 2014-03-27 11:47:42 +08:00
Jason Fowler
8340935745 MDL-43284 Theme: Clean theme errors with padding in Question Bank fixed 2014-03-27 10:39:53 +08:00
AMOS bot
428f3d8988 Automatically generated installer lang files 2014-03-27 00:48:27 +00:00