mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
80,293 Commits 36 Branches 519 Tags
Commit Graph

80293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frederic Massart
da4d9eb7be MDL-55412 theme_noname: Render tabs using bootstrap classes 
Part of MDL-55071
 2016-09-23 10:49:49 +01:00
Frederic Massart
11268ae1c4 MDL-55412 output: Make tabtree and tabobject templatables 
Part of MDL-55071
 2016-09-23 10:49:49 +01:00
Frederic Massart
65b8336ed3 MDL-55286 theme: Support compiling SCSS on-demand from a theme 
Part of MDL-55071
 2016-09-23 10:49:49 +01:00
Frederic Massart
321c986c86 MDL-55285 core: Include library scssphp in core 
Part of MDL-55071
 2016-09-23 10:49:49 +01:00
Damyon Wiese
88af020839 MDL-55411 theme_noname: Style the filepicker for bootstrap 4 
Uses templates.

Part of MDL-55071
 2016-09-23 10:49:49 +01:00
Damyon Wiese
f130c411d9 MDL-55410 theme_noname: Convert custom menu renderer to render bootstrap4 menus. 
Part of MDL-55071
 2016-09-23 10:49:49 +01:00
Damyon Wiese
bbe79e0e37 MDL-55409 theme_noname: Add better default button styles 
Part of MDL-55071
 2016-09-23 10:49:49 +01:00
Damyon Wiese
25f908968c MDL-55408 theme_noname: Add more styles for bootstrap modals 
Part of MDL-55071
 2016-09-23 10:49:49 +01:00
Damyon Wiese
d7fbf722c7 MDL-55407 theme_noname: Remove styling and JS from blocks 
Also:
Remove styles for the dock.
Remove drag and drop for blocks.
Blocks spacing improvements
After looking for a while - the blocks need some separation, so using .card now.
Adjusted the block column sizes as well.

Part of MDL-55071
 2016-09-23 10:49:48 +01:00
Damyon Wiese
d2645a6a64 MDL-55403 theme_noname: Add bootstrap4 js to moodle 
Part of MDL-55071
 2016-09-23 10:49:48 +01:00
Damyon Wiese
536f046033 MDL-55402 theme_noname: Convert bootstrapbase to bs4 
All moodle less files are converted to sass with layouts etc
written as mustache templates.

Bootstrap 4 sass files are imported to scss/bootstrap.

Part of MDL-55071
 2016-09-23 10:49:48 +01:00
Frederic Massart
3ba0023871 MDL-55401 theme_noname: Scaffolding 
Part of MDL-55071
 2016-09-23 10:49:48 +01:00
Eloy Lafuente (stronk7)
26162efe4a weekly release 3.2dev 2016-09-23 10:01:31 +02:00
Eloy Lafuente (stronk7)
54caa85cba Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-09-23 10:01:26 +02:00
Andrew Nicols
352e65861d Merge branch 'MDL-55327' of https://github.com/stronk7/moodle 2016-09-23 10:00:20 +08:00
Eloy Lafuente (stronk7)
0fba5b440d MDL-55327 mod_lesson: better convert back to plain response_editor 2016-09-22 19:17:47 +02:00
AMOS bot
14145ad5ae Automatically generated installer lang files 2016-09-23 00:04:32 +08:00
Andrew Nicols
dd193ba2ea Merge branch 'wip-MDL-55327-master-fix' of git://github.com/abgreeve/moodle 2016-09-22 15:51:04 +08:00
Andrew Nicols
be16d66087 MDL-55379 phpunit: Coding style fix 2016-09-22 15:11:16 +08:00
Andrew Nicols
a2b48e4127 Merge branch 'wip-mdl-55379-fix2' of https://github.com/rajeshtaneja/moodle 2016-09-22 15:09:43 +08:00
Rajesh Taneja
095883d1ea
MDL-55379 phpunit: Remove directory seperator if present 2016-09-22 12:56:48 +08:00
Damyon Wiese
ecdccb918d MDL-55837 themes: Remove re-setting of user/site/course theme 
These themes cannot be chosen, so this part of the upgrade step is not necessary.
 2016-09-22 12:34:38 +08:00
David Monllao
791844d25a Merge branch 'wip-mdl-55379-fix' of https://github.com/rajeshtaneja/moodle 2016-09-22 10:59:48 +08:00
Rajesh Taneja
544de35bc3
MDL-55379 phpunit: Preserve config option if passed 2016-09-22 10:45:47 +08:00
Andrew Nicols
41ff0ee58b MDL-55982 mod_forum: Allow discussion view in locked blog 2016-09-22 08:22:13 +08:00
Eloy Lafuente (stronk7)
64573a35e9 Merge branch 'MDL-55124' of https://github.com/mr-russ/moodle 2016-09-22 00:52:30 +02:00
Russell Smith
d59f1d3150 MDL-55124 database: Mode connection test to after connection. 
To verify the client encoding and other data is correct then
the connection must have been made first.
 2016-09-22 08:40:03 +10:00
Adrian Greeve
f4eef5fb25 MDL-55327 mod_lesson: Fix for copying essay and match. 
Matching and essay questions would display errors when
being duplicated.
 2016-09-21 18:04:08 +08:00
Dan Poltawski
948e6e3fca MDL-48766 lib: fix another stupid case sensitivity issue 2016-09-21 09:31:54 +01:00
Eloy Lafuente (stronk7)
6cc077e90f Merge branch 'MDL-55982-master' of git://github.com/andrewnicols/moodle 2016-09-21 03:04:36 +02:00
Andrew Nicols
0f3bbfd4f8 MDL-55982 mod_forum: Add time-based discussion locking 
This patch adds support for time-based locking of discussions.
Discussions are automatically locked after a user-definable period of
inactivity. After this time, only those with the the relevant capability
are able to add replies.

This has been designed to add support for other types of discussion locking
at a later date with relative ease.
 2016-09-21 09:03:42 +08:00
Eloy Lafuente (stronk7)
349a6430e6 Merge branch 'MDL-45752_m32v3' of https://github.com/sbourget/moodle 2016-09-20 17:36:51 +02:00
Eloy Lafuente (stronk7)
73b2a94c7f MDL-55405 enrol_paypal: Fix set_context() call 
Note that setting the page context more than once is not ideal
but as far as system->course switches are allowed, this should
not hurt, while providing more accurate messages than keeping
system context.
 2016-09-20 12:27:35 +02:00
Eloy Lafuente (stronk7)
43f53ded83 Merge branch 'MDL-55405-master' of git://github.com/cameron1729/moodle 2016-09-20 12:21:37 +02:00
Eloy Lafuente (stronk7)
ce7863ba36 Merge branch 'MDL-55124' of https://github.com/mr-russ/moodle 2016-09-20 12:13:10 +02:00
Russell Smith
f834a8f5eb MDL-55124 database: Allow option to not send options. 
pgbouncer doesn't accept the PostgreSQL options command as it can't
process it.  If you are using pgBouncer you need to make sure your
database is configured to set client encoding and standard_conforming_strings
correctly on each connection.  pgBouncer can do this, as can ALTER
commands.

Also using sockets without a filename did not allow different ports to work.
This is because you either specify a filename which includes a port or
you just specify a port and libpq works out the correct socket location.
 2016-09-20 19:53:01 +10:00
Dan Poltawski
89ae98f134 Merge branch 'MDL-55916-maintmode-503-moodle' of https://github.com/brendanheywood/moodle 2016-09-20 09:31:41 +01:00
Cameron Ball
4abbb4180b
MDL-55405 enrol_paypal: Create utility class 
Some helper functions were in the IPN file. They really should be
in their own utility class to facilitate better testing.
 2016-09-20 12:38:31 +08:00
Andrew Nicols
2fc56dd571 MDL-51361 backup: Documentation phpcs fix 2016-09-20 12:21:41 +08:00
Andrew Nicols
91d52985c5 Merge branch 'MDL-51361' of https://github.com/bostelm/moodle 2016-09-20 11:58:24 +08:00
Andrew Nicols
674de8e51e Merge branch 'MDL-55191_master' of git://github.com/dmonllao/moodle 2016-09-20 11:41:03 +08:00
Andrew Nicols
5a766a9e21 MDL-55327 mod_lesson: Whitespace fix 2016-09-20 11:19:28 +08:00
Andrew Nicols
25804281f1 Merge branch 'wip-MDL-55327-master' of git://github.com/abgreeve/moodle 2016-09-20 11:15:54 +08:00
Adrian Greeve
329b68c9ca MDL-55327 mod_lesson: Behat test for page duplication. 2016-09-20 10:36:13 +08:00
Adrian Greeve
f847669e33 MDL-55327 mod_lesson: Unit tests for the new function 2016-09-20 10:36:13 +08:00
Adrian Greeve
9f937c3bb3 MDL-55327 mod_lesson: Added the ability to duplicate pages. 2016-09-20 10:36:13 +08:00
Brendan Heywood
f1c6d647bc MDL-55916 setup: Maintenance mode serves HTTP 503 2016-09-20 11:59:39 +10:00
Andrew Nicols
77391e9f09 Merge branch 'MDL-55876-master' of git://github.com/lameze/moodle 2016-09-20 09:10:43 +08:00
Andrew Nicols
13c8792606 Merge branch 'MDL-55586-master' of https://github.com/StudiUM/moodle 2016-09-20 08:17:37 +08:00
Eloy Lafuente (stronk7)
0f4b338fbb Merge branch 'wip-mdl-55379' of https://github.com/rajeshtaneja/moodle 2016-09-20 02:06:32 +02:00