Sam Hemelryk
83c875a9a0
Merge branch 'MDL-41591_zindex' of https://github.com/andyjdavis/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-09-24 08:28:40 +12:00
Eloy Lafuente (stronk7)
fe64d4f7c8
Merge branch 'int_install' of https://github.com/skodak/moodle
2013-09-23 22:05:26 +02:00
Petr Škoda
1a4621d8e5
MDL-31501 fake requried globals in both installers
2013-09-23 21:46:05 +02:00
Marina Glancy
cbbaffc7d3
Merge branch 'MDL-41833-master' of git://github.com/ankitagarwal/moodle
2013-09-23 19:16:43 +10:00
Marina Glancy
009e0d28ae
Merge branch 'w39_MDL-37324_m26_phpmailer' of https://github.com/skodak/moodle
2013-09-23 18:15:35 +10:00
Petr Škoda
6226cc30fb
MDL-37324 fix phpmailer method case names and standardise phpmailer init
2013-09-23 10:11:27 +02:00
Marina Glancy
3e36c789d7
Merge branch 'MDL-41311-master' of git://github.com/danpoltawski/moodle
2013-09-23 14:48:10 +10:00
Andrew Davis
f44b891630
MDL-41591 removed unnecessary zindexes from Clean
2013-09-23 11:40:34 +07:00
Marina Glancy
b443071378
Merge branch 'wip-MDL-41772-master' of git://github.com/abgreeve/moodle
2013-09-23 14:39:45 +10:00
Sam Hemelryk
98d696b6d5
MDL-31501 session: fixed missing autoloader during install
2013-09-23 15:38:45 +12:00
Sam Hemelryk
d99847a338
Merge branch 'w39_MDL-31501_m26_sessionreboot' of https://github.com/skodak/moodle
2013-09-23 15:02:49 +12:00
Petr Škoda
d79d5ac276
MDL-31501 rework user session architecture
...
List of changes:
* New OOP API using PHP namespace \core\session\.
* All handlers now update the sessions table consistently.
* Experimental DB session support in Oracle.
* Full support for session file handler (filesystem locking required).
* New option for alternative session directory.
* Official memcached session handler support.
* Workaround for memcached version with non-functional gc.
* Improved security - forced session id regeneration.
* Improved compatibility with recent PHP releases.
* Fixed borked CSS during install in debug mode.
* Switched to file based sessions in new installs.
* DB session setting disappears if DB does not support sessions.
* DB session setting disappears if session handler specified in config.php.
* Fast purging of sessions used in request only.
* No legacy distinction - file, database and memcached support the same functionality.
* Session handler name included in performance info.
* Fixed user_loggedin and user_loggedout event triggering.
* Other minor bugfixing and improvements.
* Fixed database session segfault if MUC disposed before $DB.
Limitations:
* Session access time is now updated right after session start.
* Support for $CFG->sessionlockloggedinonly was removed.
* First request does not update userid in sessions table.
* The timeouts may break badly if server hosting forces PHP.ini session settings.
* The session GC is a lot slower, we do not rely on external session timeouts.
* There cannot be any hooks triggered at the session write time.
* File and memcached handlers do not support session lock acquire timeouts.
* Some low level PHP session functions can not be used directly in Moodle code.
2013-09-21 13:11:56 +02:00
Petr Škoda
29bf99fdc1
MDL-37324 import phpmailer 5.2.7
2013-09-20 18:11:50 +02:00
Petr Škoda
aaee690b89
MDL-41208 import YUI 3.12.0 with @VERSION@ fix for simpleyui
2013-09-20 18:03:18 +02:00
Petr Škoda
81881cb9d6
MDL-41787 make sure maturity constants are defined before they are used in core_component class
2013-09-20 17:22:20 +02:00
Sam Hemelryk
7f3836d15a
weekly release 2.6dev
2013-09-20 14:40:59 +12:00
Sam Hemelryk
0546f1bf8f
NOBUG: fixed file permissions
2013-09-20 14:37:30 +12:00
Sam Hemelryk
2e79f57db9
Merge branch 'install_master' of git://git.moodle.org/moodle-install
2013-09-20 14:34:25 +12:00
Sam Hemelryk
6af9ab573b
Revert "MDL-41466 theme_formal_white: moved courses action icons once again on the right"
...
This reverts commit c724e009960a399170bbddc58ca2f26737504287.
2013-09-20 08:39:57 +12:00
Andrew Davis
dc1bb8d067
MDL-41591 removed some unnecessary z-indexes from css
2013-09-19 10:19:39 +07:00
AMOS bot
f0a617ed82
Automatically generated installer lang files
2013-09-19 00:44:10 +00:00
Sam Hemelryk
669755a423
Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle
2013-09-19 09:49:31 +12:00
Dan Marsden
d6d0c4e00b
MDL-38489 SCORM: obtain correct section number when getting course_url
2013-09-19 09:36:52 +12:00
Eloy Lafuente (stronk7)
9ea4eedf22
Merge branch 'MDL-38661-m-i' of git://github.com/andrewnicols/moodle
2013-09-18 17:09:25 +02:00
Eloy Lafuente (stronk7)
cae8956648
Merge branch 'MDL-41188-master-fix1' of git://github.com/damyon/moodle
2013-09-18 15:44:31 +02:00
Damyon Wiese
ce5867a178
MDL-41188 javascript: Prevent scrolling to top
...
This fix is for dialogues that are not created until some time after the page
has loaded.
2013-09-18 20:21:34 +08:00
Andrew Nicols
dd834cba33
MDL-38661 JavaScript: Add missing lazy loading on collapseall
2013-09-18 11:04:31 +01:00
AMOS bot
09fd6d9114
Automatically generated installer lang files
2013-09-18 00:45:28 +00:00
Eloy Lafuente (stronk7)
abef633c33
Merge branch 'MDL-41570-master-v2' of git://github.com/jamiepratt/moodle
2013-09-17 21:57:07 +02:00
Eloy Lafuente (stronk7)
5c34952b82
Merge branch 'wip-mdl-41717' of git://github.com/rajeshtaneja/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-09-17 21:22:30 +02:00
Eloy Lafuente (stronk7)
cfcd93dd11
Merge branch 'MDL-41728-master' of git://github.com/sammarshallou/moodle
2013-09-17 21:17:05 +02:00
Eloy Lafuente (stronk7)
e79ca991fb
Merge branch 'master_MDL-32506' of git://github.com/danmarsden/moodle
2013-09-17 21:11:26 +02:00
Eloy Lafuente (stronk7)
e60756632a
Merge branch 'wip-mdl-41711' of git://github.com/rajeshtaneja/moodle
2013-09-17 20:22:32 +02:00
Eloy Lafuente (stronk7)
1ee2fb5a11
Merge branch 'MDL-41188-master' of git://github.com/damyon/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-09-17 20:04:08 +02:00
Eloy Lafuente (stronk7)
58c9faeaca
Merge branch 'MDL-38661-m-wip' of git://github.com/andrewnicols/moodle
...
Conflicts:
theme/base/style/core.css
theme/bootstrapbase/style/moodle.css
2013-09-17 19:59:55 +02:00
Ankit Agarwal
0f142ea0a8
MDL-41833 feedback: Fix setType() warning when deleting a response in feedback
2013-09-17 15:14:19 +08:00
Marina Glancy
2b7a557c28
Merge branch 'MDL-41622_b' of git://github.com/rwijaya/moodle
2013-09-17 16:43:12 +10:00
Rossiani Wijaya
764d7ba9b4
MDL-41622 workshop mod: fix page heading levels.
...
Also, changing couple of the sub header to use notification, which is more appropriate.
2013-09-17 12:44:25 +08:00
Sam Hemelryk
d4d97627d2
Merge branch 'MDL-41817-master' of git://github.com/sammarshallou/moodle
2013-09-17 15:26:06 +12:00
Sam Hemelryk
26c9c586c9
Merge branch 'MDL-41572-master' of git://github.com/jamiepratt/moodle
2013-09-17 14:30:16 +12:00
Sam Hemelryk
23eed08e1a
Merge branch 'MDL-41540-master-v2' of git://github.com/jamiepratt/moodle
2013-09-17 14:02:47 +12:00
Sam Hemelryk
81ece3f7aa
Merge branch 'MDL-41571-master' of git://github.com/jamiepratt/moodle
2013-09-17 14:00:15 +12:00
Marina Glancy
9f21d24895
Merge branch 'MDL-41612_b' of git://github.com/rwijaya/moodle
2013-09-17 11:10:44 +10:00
Marina Glancy
4a91055f7c
Merge branch 'MDL-39959-master' of git://github.com/ankitagarwal/moodle
2013-09-17 11:08:27 +10:00
Eloy Lafuente (stronk7)
ba57caa349
Merge branch 'MDL-41595_M26' of git://github.com/lazydaisy/moodle
2013-09-17 02:15:06 +02:00
Sam Hemelryk
c8f052dbdd
Merge branch 'wip-MDL-41715-master' of git://github.com/marinaglancy/moodle
2013-09-17 11:44:39 +12:00
Sam Hemelryk
29b56cfd09
MDL-38489 mod_scorm: added require to be explicit
2013-09-17 09:12:02 +12:00
Sam Hemelryk
77365f7ff6
Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle
2013-09-17 09:02:32 +12:00
Sam Hemelryk
f34af1167a
Merge branch 'MDL-41667' of git://github.com/timhunt/moodle
2013-09-17 08:59:08 +12:00
Sam Hemelryk
82b2bb5eca
Merge branch 'MDL-37148-master' of git://github.com/damyon/moodle
2013-09-17 08:50:38 +12:00