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,020 Commits 36 Branches 519 Tags
Commit Graph

4954 Commits

Author SHA1 Message Date
Dan Poltawski
ebf709ded5 MDL-46227 fix typo 2014-07-09 08:22:45 +01:00
Dan Poltawski
59ba5a5952 Merge branch 'MDL-45599-master-addons' of git://github.com/mudrd8mz/moodle 2014-07-08 15:31:50 +01:00
Dan Poltawski
772d658f1d Merge branch 'MDL-45596-master' of git://github.com/FMCorz/moodle 2014-07-08 10:50:55 +01:00
Helen Foster
272a071694 MDL-45599 Fix tiny grammatical errors in the plugin installer 2014-07-08 09:07:01 +02:00
Skylar Kelty
79a70e776e MDL-46227 Fix XSS in scheduled tasks 2014-07-08 13:37:13 +08:00
Sam Hemelryk
cf9ae1134c Merge branch 'm28_MDL-46225' of https://github.com/totara/moodle 2014-07-08 10:36:10 +12:00
David Mudrák
d49db5b2de MDL-45599 Stop using the 'add-on' term 
We now call them all as just 'plugins' for consistency. There where we need to
explicitly distinguish the source of the plugin, we say they are 'additional
plugins' on contrary to 'standards plugins' coming with the core.
 2014-07-04 13:16:53 +02:00
Frederic Massart
af2a1e4e33 MDL-45596 roles: Escape filter value before using it in form field 2014-07-04 11:49:11 +08:00
Brian Barnes
8d29ac9803 MDL-46225 core_admin: Changed heading to add a new user to a button 2014-07-03 09:01:29 +12:00
Eloy Lafuente (stronk7)
fc8caadf43 Merge branch 'wip-mdl-45889' of https://github.com/rajeshtaneja/moodle 2014-07-02 00:21:21 +02:00
Dan Poltawski
99fbe16211 Merge branch 'wip_MDL-46099_m28_userglobal' of https://github.com/skodak/moodle 2014-07-01 10:39:14 +01:00
Petr Skoda
2e00d01db4 MDL-46099 session: fix use of references for session globals 
This reverses the references used for global $USER and $SESSION,
the reason is that PHP does not allow references to references.
$USER is a reference to $GLOBALS['USER'] which means we cannot
put any references to it. Solution is to store the current user and session
objects in $GLOBALS['USER'] and $GLOBALS['SESSIOn'] are reference
them in $_SESSION.

This patch makes the session code behave the same way in CLI,
phpunit and normal web requests - this allows use to finally
unit test most aspects of the session code in Moodle.
 2014-07-01 08:38:00 +12:00
Dan Poltawski
f74b3cd8bc Merge branch 'wip-mdl-45641' of https://github.com/rajeshtaneja/moodle 2014-06-30 15:12:30 +01:00
Rajesh Taneja
9363073b22 MDL-45641 event: Manually trigger event where needed. 
Some places, user_created_user and user_updated_user
events should be triggred after profile data is saved.
 2014-06-27 15:44:56 +08:00
David Monllao
c16970ead0 MDL-45833 event: Removing courseid as the context is higher than course context 2014-06-27 11:25:14 +08:00
Rajesh Taneja
cbda1aa244 MDL-45889 behat: Allow admin config to set by shortname 2014-06-26 13:18:00 +08:00
Eloy Lafuente (stronk7)
046930cfba Merge branch 'MDL-46045-master' of git://github.com/damyon/moodle 2014-06-24 21:48:30 +02:00
Damyon Wiese
2ef26ad94f Merge branch 'wip_MDL-45985_m28_dbschema' of https://github.com/skodak/moodle 2014-06-24 14:19:20 +08:00
Damyon Wiese
a084ac0db4 MDL-46045 Fix php tags (lowercase) everywhere 2014-06-19 11:05:16 +08:00
Petr Skoda
4f4fb38cb5 MDL-45985 cli: add new cli tool for validation of database structure 2014-06-17 16:54:31 +12:00
Eloy Lafuente (stronk7)
d519545a54 Merge branch '45884-28' of https://github.com/samhemelryk/moodle 2014-06-17 00:09:50 +02:00
Rajneel Totaram
8fb7520095 MDL-45967 admin lang: Fix typo 2014-06-16 17:26:34 +08:00
Marina Glancy
14422ae946 Merge branch 'MDL-43274-master' of git://github.com/xow/moodle 2014-06-16 17:23:53 +08:00
John Okely
bb8d6e1a81 MDL-43274 Course: Remove ability to delete logs on a course during reset 2014-06-16 09:10:05 +08:00
Sam Hemelryk
99f041ebfa MDL-45884 navigation: changed to positive setting phrasing 2014-06-13 10:16:25 +12:00
Sam Hemelryk
aab6438ca1 MDL-45884 navigation: tidied up code and added behat tests 2014-06-13 10:16:25 +12:00
Syxton
4d378e9f70 MDL-45884 navigation: setting that allows sites to collapse My Courses by default 2014-06-13 10:16:25 +12:00
Damyon Wiese
79b1aa8ac3 Merge branch 'wip-MDL-44309-master' of https://github.com/deraadt/moodle 2014-06-10 14:06:19 +08:00
Michael de Raadt
cae7b8882a MDL-44309 Administration - correcting inproperly assigned column classes in environment table 2014-06-05 10:59:34 +08:00
Rajesh Taneja
1bce3a70d9 MDL-44839 admin: Moved all system executable paths to config 
AMOS BEGIN
 MOV ['gspath','assignfeedback_editpdf'],['pathtogs','admin']
 MOV ['gspath_help','assignfeedback_editpdf'],['pathtogs_help','admin']
AMOS END
 2014-06-03 17:33:49 +08:00
Eloy Lafuente (stronk7)
f94891cc00 MDL-45503 upgrade: add v2.7.0 sep lines 2014-05-28 01:13:42 +02:00
Damyon Wiese
2562653a27 Merge branch '45499-28' of git://github.com/samhemelryk/moodle 2014-05-26 12:04:42 +08:00
Sam Hemelryk
bba9c3bcf8 Merge branch 'master_MDL-45623' of git://github.com/totara/moodle 2014-05-26 09:58:48 +12:00
Sam Hemelryk
b8b47a15da MDL-45499 admin: fixed error when displaying page settings 2014-05-26 09:01:16 +12:00
Damyon Wiese
4e8a350c35 Merge branch 'MDL-45618' of git://github.com/timhunt/moodle 2014-05-20 14:59:48 +08:00
Sam Hemelryk
46921d74a6 Merge branch 'MDL-44323-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 15:42:32 +12:00
Damyon Wiese
cf229a526c Merge branch '44974-28' of git://github.com/samhemelryk/moodle 2014-05-20 08:49:56 +08:00
Sam Hemelryk
4dc5c77f33 Merge branch 'MDL-45477-master' of https://github.com/sammarshallou/moodle 2014-05-20 11:58:12 +12:00
Simon Coggins
9811cb650c MDL-45623: Fix assigned users count on role delete confirmation page 2014-05-20 10:01:00 +12:00
Tim Hunt
5bcfd504df MDL-45618 Fix @since PHPdoc tags. 2014-05-19 17:03:04 +01:00
Sam Hemelryk
12890c57f2 MDL-44974 admin: repositioned call to initialise renderer 2014-05-19 08:41:29 +12:00
Dan Poltawski
376a17e4ae MDL-44323 admin: use correct css class for warning 
The notifyproblem notification is consistent with the rest of
the warnings we report.
 2014-05-15 12:00:11 +08:00
sam marshall
2164bd723a MDL-45477 Behat: List of steps takes too long to load, times out 
Increase time limit to 300 seconds (5 minutes).
 2014-05-14 11:06:51 +01:00
Juan Leyva
a4496bdde9 MDL-36670 logging: action parameter length restricted to 40 chars 2014-05-13 16:05:39 +02:00
Marina Glancy
f094167bef MDL-45486 Bump all versions to planned release 2014-05-09 10:50:39 +08:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release 
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
 2014-05-09 02:12:28 +02:00
Marina Glancy
f69c0d572e Merge branch 'MDL-45398-master' of git://github.com/sammarshallou/moodle 2014-05-08 12:04:53 +08:00
sam marshall
59d585d135 MDL-45398 Manage availability restrictions: Show/hide not working 
The show/hide icons were not working correctly. In addition, the
report still displayed even when availability feature was turned
off.

As well as fixing them, I added a Behat test to cover this report.
 2014-05-07 10:15:27 +01:00
Andrew Nicols
02915dfc23 MDL-45357 events: Remove unnecessary the before 'id' in event descriptions 2014-05-06 16:45:05 +08:00
Damyon Wiese
0c3e0f4752 Merge branch 'MDL-45329-master' of git://github.com/andrewnicols/moodle 2014-05-01 12:29:55 +08:00