mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-27 02:53:29 +01:00
Code Issues Projects Releases Wiki Activity
71,934 Commits 36 Branches 527 Tags
Commit Graph

19639 Commits

Author SHA1 Message Date
Petr Skoda
89e9321f96 MDL-47834 auth: Allow enforcing of login limits 2014-11-21 10:00:01 +13:00
Dan Poltawski
17d4ff23ee Revert "MDL-46531 Make atto foreground colors and background colors configurable" 
This reverts commit cb6e1d527093bb955946498850ef8a51276a13a4.

This reverts commit 7a5e6054248ef18f05a228ab0db4d05e5d782180, reversing
changes made to 7b9fb265d20e53580a64dcd2be8546ff5b49bd26.

This reverts commit 06404b01180a2965804fab9e47715fdc2b6bdfb4, reversing
changes made to 0f87473fed2da15a8ba72ac9a578734fe2548f10.

Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-20 07:04:41 +00:00
Andrew Nicols
cb6e1d5270 MDL-46531 editor_atto: fontcolor -> backcolor 2014-11-20 10:46:04 +08:00
Sam Hemelryk
9915109268 MDL-48304 moodle_url: compare now considers anchor 2014-11-20 15:38:34 +13:00
Adrian Greeve
b49964f7fc MDL-48252 scheduled tasks: Unit test for file_temp_cleanup_task. 2014-11-20 10:35:47 +08:00
David Balch
112aed6035 MDL-9443 core_files: Also filter .xhtml resources. 
Change the filters to treat .xhtml files the same as .html,
so they are filtered by both "All files" and "HTML files only".
 2014-11-19 14:14:50 +00:00
Andrew Nicols
db97ff0ee6 MDL-46531 editor_atto: Handle a null selection better on colour change 
Sadly, there is no easy way to do this. When a range is empty, we need to
create a new span, make the changes there, and then select it. Rangy does
not provide a helper to do this yet (will be in 1.3) so we have to do it
manually in the mean time.
 2014-11-19 15:45:37 +08:00
Andrew Nicols
fc05c1b8e5 MDL-48197 testing: Normalise uses of noemailever and phpmailer sink 2014-11-19 09:09:50 +08:00
Andrew Nicols
556e3a9e8a MDL-48197 testing: Always set up a mail sink for mail redirection 
Rather than setting noemailever in the bootstrap, this sets up a default
phpmailer message sink which will catch all messages.

Tests which require the phpmailer sink will continue to work as before
without change, though the noemailever config setting no longer needs to
be altered.

For tests wanting to test with noemailever set with the previous behaviour,
they will need to load the message sink and then close it.
 2014-11-19 09:09:49 +08:00
Andrew Nicols
494cf9b81c MDL-23839 navigation: Check for assignable course category roles 2014-11-19 08:54:53 +08:00
Sam Hemelryk
a74d4743e1 MDL-33606 event: moved upgrade notice 2014-11-19 09:38:55 +13:00
Sam Hemelryk
469c32955a Merge branch 'MDL-33606_master' of git://github.com/dmonllao/moodle 2014-11-19 09:37:19 +13:00
Daniel Thies
3086c8cedb MDL-45867 atto_equation: Change preview update to asynchronous 2014-11-18 13:26:13 -06:00
Dan Poltawski
eb0acfa311 Merge branch 'wip_MDL-47800_m28_pwchange2' of git://github.com/skodak/moodle 2014-11-18 16:32:57 +00:00
Dan Poltawski
c8b01e0c7d Merge branch 'MDL36874_Text_navigation_for_Books' of git://github.com/Dave-B/moodle 
Conflicts:
	mod/book/version.php
	mod/book/db/upgrade.php
 2014-11-18 13:54:05 +00:00
Dan Poltawski
39da77774a Merge branch 'wip_MDL-47803_m28_usersessions2' of https://github.com/skodak/moodle 2014-11-18 10:15:06 +00:00
Adrian Greeve
767d01cf39 MDL-48252 scheduled tasks: file_temp_cleanup_task does full delete. 
This scheduled task was previously only doing a partial delete
due to the fact that the directory modification time would be
updated when a child file was deleted. It would then have to
wait another week before that directory could be deleted.
 2014-11-18 14:17:24 +08:00
Eloy Lafuente (stronk7)
ea1720be99 Merge branch '48070-29' of git://github.com/samhemelryk/moodle 2014-11-18 03:41:28 +01:00
Petr Skoda
8064168e3c MDL-47803 Add report that lists user sessions 2014-11-18 13:55:11 +13:00
Sam Hemelryk
06404b0118 Merge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-18 10:48:31 +13:00
Sam Hemelryk
699f60c6f7 MDL-48070 navbar: ensure navigation initialised 2014-11-18 09:55:36 +13:00
Petr Skoda
866f03de46 MDL-47800 auth: Add option to logout on pw change 2014-11-18 09:51:52 +13:00
Daniel Thies
8bca3609ee MDL-48064 atto_editor: Expand event subscription for saving selection 2014-11-17 11:15:45 -06:00
Dan Poltawski
b4dd8e28cd Merge branch '48070-29' of git://github.com/samhemelryk/moodle 2014-11-17 16:22:26 +00:00
Tim Hunt
1b49f31df2 MDL-48259 questionlib.php: remove functions deprecated in Moodle 2.6 2014-11-17 15:55:22 +00:00
Dan Poltawski
296e292413 Merge branch 'm29_MDL-48023_Theme_Setting_Files_Cacheable_By_Both_Browsers_And_Proxies' of https://github.com/scara/moodle 2014-11-17 15:20:17 +00:00
Tim Hunt
4c3c1b5169 MDL-48259 questionlib.php: remove functions deprecated in Moodle 2.1 2014-11-17 15:19:56 +00:00
Dan Poltawski
96ac6cb964 Merge branch 'MDL-42756' of git://github.com/aolley/moodle 2014-11-17 13:52:39 +00:00
Dan Poltawski
bb4013f5c7 Merge branch 'MDL-43987-master' of git://github.com/xow/moodle 2014-11-17 13:17:40 +00:00
Dan Poltawski
a020ddecf0 Merge branch 'MDL-46640-master' of git://github.com/FMCorz/moodle 2014-11-17 12:52:35 +00:00
David Monllao
d931574ff9 MDL-33606 course: Adding section info to course_viewed log 
Also changing references to section id to
section number, that it is what it really is.
 2014-11-17 15:18:18 +08:00
Frederic Massart
0209a85704 MDL-46640 navigation: Handle block contexts within a category 2014-11-17 12:41:41 +08:00
John Okely
c2a9bb3a9d MDL-43987 core: Remove port numbers in cleanremoteaddr 2014-11-17 09:48:26 +08:00
Sam Hemelryk
d6abe6f744 Merge branch 'MDL-48194-master' of git://github.com/andrewnicols/moodle 2014-11-17 13:39:03 +13:00
Sam Hemelryk
b83a0323da Merge branch 'MDL-48196-master' of git://github.com/andrewnicols/moodle 2014-11-17 12:34:02 +13:00
Sam Hemelryk
2928dfd8a0 Merge branch 'master_MDL-47993' of https://github.com/totara/moodle 2014-11-17 12:21:16 +13:00
Sam Hemelryk
6d97620481 Merge branch 'MDL-44657-master' of git://github.com/FMCorz/moodle 2014-11-17 10:34:09 +13:00
Matteo Scaramuccia
bb8ed60a3c MDL-48023 Files API: Theme files must be cache-able by shared proxies. 
The profile image AKA user icon will be cache-able by shared proxies too,
under its specific accessibility constraints/conditions.
 2014-11-16 09:53:27 +01:00
Daniel Thies
9b9a3abf9b MDL-48064 atto_editor: Check if activeElement is child node in isActive 2014-11-14 11:49:15 -06:00
Sam Hemelryk
aac8dfa8b6 MDL-48070 navigation: optimised the login page 
The navigation and settings no longer get initialised on the login
page by default, this is achieved by calling to ignore the active
page on the navbar.
It is safe because the login page is not represented in either the
navigation or the settings.

This change saves a few MB or ram and a couple of database queries
 2014-11-14 11:40:25 +13:00
Oleg Demeshev
741063b41c MDL-47993 calendar: Fix ical import Microsoft calendar issue 2014-11-14 10:32:54 +13:00
Paul Holden
68ef378b1b MDL-44657 forms: Form identifiers should only contain basic characters 2014-11-13 16:20:28 +08:00
Andrew Nicols
14ecbb2ee8 MDL-48196 phpunit: Set e-mail address for admin user at installation 2014-11-13 08:47:43 +08:00
Dan Poltawski
bfa16aa2fa Merge branch 'wip-mdl-48174' of https://github.com/rajeshtaneja/moodle 2014-11-12 11:03:43 +00:00
Andrew Nicols
a9edd8a671 MDL-48194 testing: Adjust naming of testsuites in phpunit.xml 
This will make it easier to run phpunit for a specific component by making
all testsuite names consistent, guessable, and in-line with the naming of
the parameter (testsuite vs. test suite).
 2014-11-12 11:46:03 +08:00
Adam Olley
09869dd583 MDL-42756 dock: Trigger actionmenu enhance when showing dock panel 
Additionally fixes the styling for the actionmenu icon size in
bootstrapbase'd themes.
 2014-11-12 14:10:07 +10:30
Dan Poltawski
73f755a799 MDL-47502 statslib tests: improve test 
While integrating I noticed some problems which already existed in this
test:
* The enrolment data generator was not used
* The student roleid was hardocded
* The role assignment was at site level..
 2014-11-11 19:25:49 +00:00
Eugene Venter
ba923f4f9a MDL-47502 test_statslib_cron_daily: fix provider 
Fiddling with the database in the data provider causes "out of sync"
errors when running suite tests.
 2014-11-11 19:12:51 +00:00
Dan Poltawski
e0fa3e952b Merge branch 'MDL-48093-master' of https://github.com/sammarshallou/moodle 2014-11-11 18:59:55 +00:00
Dan Poltawski
cae0c46b9b Merge branch 'MDL-48156-master-pluginisenabled' of git://github.com/mudrd8mz/moodle 2014-11-11 17:16:00 +00:00