Dan Poltawski
4e85084148
Merge branch 'MDL-18301-master' of git://github.com/FMCorz/moodle
2012-07-09 14:27:10 +08:00
Sam Hemelryk
141d3c86d3
MDL-29538 condition: Tidied up user field condition code post merge
2012-07-09 11:45:44 +12:00
Sam Hemelryk
871c06e583
Merge branch 'MDL-29538_usercond' of git://github.com/markn86/moodle
2012-07-09 11:44:39 +12:00
Petr Škoda
8956a329a6
MDL-34101 do not try to authenticate non-existent users when user creation is prevented
2012-07-06 07:59:44 +02:00
Petr Škoda
13951f0ce7
MDL-34101 use current mnethostide when verifying if user deleted
...
authenticate_user_login() is supposed to work with local accounts only,
mnet accounts must be ignored.
2012-07-06 07:59:44 +02:00
Frederic Massart
455dc0de61
MDL-18301 Gradebook: Added feature for components to control grade visibility
2012-07-06 09:52:46 +08:00
Tim Hunt
fede0be5de
MDL-34065 lib: improve two debugging messages.
...
If the string passed to get_string is empty, say that. Don't say that it
contains illegal characters.
When relying on the __call magic in plugin_renderer_base, when the
method cannot be found, include the right class name in the error
message.
2012-07-05 13:48:12 +02:00
Mark Nelson
94b94c38e7
MDL-29538 core_condition: Section conditions are now deleted from DB
2012-06-26 15:18:53 +08:00
Sam Hemelryk
33e657c7e7
MDL-29538 core_condition: Pre-integration merge cleanup
...
* Fixed up database installation and upgrade code
* Reverted some whitespace optimisations to minimise conflicts
* Optimised commits made by Mark to reduce complexity and add tracker issue numbers
2012-06-26 15:18:53 +08:00
Mark Nelson
d2170cb542
MDL-29538 core_condition: moved the deletion of the course_modules_availability information above the deletion of the course modules
2012-06-26 15:18:53 +08:00
Mark Nelson
cb4492c200
MDL-29538 core_condition: changed the logic in the code so that it works with the new database structure as well as tidying up parts of the code
2012-06-26 15:18:52 +08:00
Mark Nelson
92fb7dd3a5
MDL-29538 core_condition: made changes to the DB structure - nb. had to rename the table due to length limit
2012-06-26 15:18:51 +08:00
Mark Nelson
76af15bb4c
MDL-29538 core_condition: initial commit to add support for making things conditional on user profile fields
2012-06-26 15:18:51 +08:00
Andrew Davis
7db6bb7f61
MDL-33717 files: improved display_size() so that it displays something nice for -1
2012-06-21 10:14:32 +07:00
Andrew Davis
bc8da017b5
MDL-27156 repositories: altered filepicker.php so that users with the ability to ignore course file size restrictions are not incorrectly restricted
2012-06-20 11:27:31 +07:00
Eloy Lafuente (stronk7)
a4b9f21e45
MDL-27156 maxfilesize: Comment out new cap use + return -1 as temp fix
...
With the capability check and the return -1 commented
it has been checked here that it's possible to upload
and pick from filesystem repository files normally, so
I'm introducing this temp commit to allow people to
use those repos "normallly" until a proper fix arrives
supporting the new cap.
2012-06-15 20:05:46 +02:00
Andrew Davis
1812ea3e06
MDL-27156 repositories: switched some spots over to using get_user_max_upload_file_size() instead of get_max_upload_file_size()
2012-06-14 09:19:25 +07:00
Andrew Davis
8ac95c279c
MDL-27156 repository: Added a new capability so that select users can bypass file size restrictions
2012-06-14 09:19:25 +07:00
Dan Poltawski
901f49097a
Merge branch 'MDL-33532' of git://github.com/timhunt/moodle
2012-06-07 22:23:38 +08:00
Tim Hunt
7f5f384477
MDL-33532 quiz editing: let uses enter locale floats.
...
So, for example, Croatian users can set the maximum grade to 65,5.
2012-06-07 12:55:53 +01:00
Dan Poltawski
dcba513f4b
Merge branch 'w23_MDL-32632_m23_windate' of git://github.com/skodak/moodle
2012-06-06 12:27:10 +08:00
Sam Hemelryk
7df271d9b3
Merge branch 'MDL-27559-master-v2' of https://github.com/mackensen/moodle
2012-06-06 08:51:11 +12:00
Petr Skoda
63d59875b5
MDL-32632 fix date formatting on Windows
2012-06-01 12:24:33 +02:00
Petr Skoda
0aff15c2c9
MDL-33007 add workaround for broken iconv //IGNORE
...
This patch adds mbstring utf-8 cleanup fallback and admin warning if no utf-8 cleanup possible in user submitted data.
2012-06-01 12:23:09 +02:00
Dan Poltawski
4ad85bd857
MDL-33359 - mtrace: dont output to STDOUT in unit tests
...
This allows us to use phpunit output buffering functions
2012-05-28 09:36:12 +08:00
Charles Fulton
80c27aab8c
MDL-27559 opendir: validate directory pointer on open
2012-05-25 08:52:12 -07:00
Eloy Lafuente (stronk7)
dd420abadf
Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle
...
Conflicts:
lib/db/upgrade.php
lib/phpunit/lib.php
version.php
Fixed:
lib/db/upgrade.php - duplicate course->sectioncache add code
lib/db/install.xml - cleanup needed because xmldb editor was not used
lib/phpunit/classes/util.php - cleanup $GROUPLIB_CACHE on test reset
2012-05-16 23:53:47 +02:00
Aparup Banerjee
7585ac89bd
Merge branch 'MDL-32988-master' of git://github.com/sammarshallou/moodle
2012-05-16 14:03:56 +08:00
sam marshall
a7d09b7008
MDL-32988 Lib: Course delete does availability/completion in wrong order
...
When deleting modules that failed to delete using normal method, it deleted
the course-modules table first and then the availability/completion,
which depend on the entries in course-modules table. This commit switches
the order.
2012-05-15 12:02:00 +01:00
sam marshall
ce4dfd2703
MDL-24419 (4): Add conditional availability support to sections; section cache
...
Credit: original version done by Kirill Astashov of NetSpot (netspot.com.au),
finished and tweaked by sam.
This change adds conditional availability support for sections analagous to
that already available for activities. (Backend, UI, backup/restore.)
In order that this feature does not reduce performance, section cacheing has
also been added using a new course 'sectioncache' field analagous to modinfo.
The new feature integrates with activity availability so that activities
inside sections which are not available are automatically not available
themselves (meaning it works to restrict access).
2012-05-14 11:19:25 +01:00
sam marshall
637da99edb
MDL-24419 (3): Add new parameter to format_float for shorter display
2012-05-14 11:15:16 +01:00
Petr Skoda
db990d3a47
MDL-32830 add new hidden yuidebug setting for module backtraces
2012-05-12 17:06:45 +02:00
sam marshall
daefd6eb97
MDL-29624 Media embedding system, part 1: new API and filter changes
...
Includes new API in medialib.php and core_media_renderer in outputrenderers.php.
Enable/disable settings moved from filter to systemwide appearance page.
Filter changed to use new API.
AMOS BEGIN
MOV [flashanimation,filter_mediaplugin],[flashanimation,core_media]
MOV [flashanimation_help,filter_mediaplugin],[flashanimation_desc,core_media]
MOV [flashvideo,filter_mediaplugin],[flashvideo,core_media]
MOV [flashvideo_help,filter_mediaplugin],[flashvideo_desc,core_media]
MOV [html5audio,filter_mediaplugin],[html5audio,core_media]
MOV [html5audio_help,filter_mediaplugin],[html5audio_desc,core_media]
MOV [html5video,filter_mediaplugin],[html5video,core_media]
MOV [html5video_help,filter_mediaplugin],[html5video_desc,core_media]
MOV [mp3audio,filter_mediaplugin],[mp3audio,core_media]
MOV [mp3audio_help,filter_mediaplugin],[mp3audio_desc,core_media]
MOV [legacyquicktime,filter_mediaplugin],[legacyquicktime,core_media]
MOV [legacyquicktime_help,filter_mediaplugin],[legacyquicktime_desc,core_media]
MOV [legacyreal,filter_mediaplugin],[legacyreal,core_media]
MOV [legacyreal_help,filter_mediaplugin],[legacyreal_desc,core_media]
MOV [legacywmp,filter_mediaplugin],[legacywmp,core_media]
MOV [legacywmp_help,filter_mediaplugin],[legacywmp_desc,core_media]
MOV [legacyheading,filter_mediaplugin],[legacyheading,core_media]
MOV [legacyheading_help,filter_mediaplugin],[legacyheading_desc,core_media]
MOV [sitevimeo,filter_mediaplugin],[sitevimeo,core_media]
MOV [sitevimeo_help,filter_mediaplugin],[sitevimeo_desc,core_media]
MOV [siteyoutube,filter_mediaplugin],[siteyoutube,core_media]
MOV [siteyoutube_help,filter_mediaplugin],[siteyoutube_desc,core_media]
AMOS END
2012-05-09 18:29:29 +01:00
Dan Poltawski
b9bcdb54da
MDL-32505 course: drop course_display table and settings
2012-05-04 10:52:56 +08:00
Dan Poltawski
0dda790c05
Merge branch 'w18_MDL-32628_m23_avatarperf2' of git://github.com/skodak/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2012-05-04 09:28:41 +08:00
Eloy Lafuente (stronk7)
150166d371
Merge branch 'wip-mdl-32234' of git://github.com/rajeshtaneja/moodle
2012-05-03 00:35:34 +02:00
Dan Poltawski
6b445cb17a
Merge branch 'w18_MDL-30686_m23_guessurl' of git://github.com/skodak/moodle
2012-05-01 11:27:16 +08:00
Rajesh Taneja
4a9c429b0c
MDL-32234 Library: usergetdate return different values when timezone is set
...
usergetdate should return consistent values for different timezone. There are
two return path
1. If timezone is servertime, it returns getdate
2. If timezone other then servertime, it use gmstrftime, which returns string and
values with leading zero.
In second case, leading zero's are removed and values are type casted. One major fix
is with yday, getdate returns 0 through 365, whereas %j returns 001 through 366. This
has been fixed as well.
2012-04-30 10:59:01 +08:00
Petr Skoda
faa328c385
MDL-32628 fix user_picture performance
2012-04-27 13:56:08 +02:00
Petr Skoda
51b7297b7e
MDL-32586 silence buggy glibc when fixing utf-8 strings
2012-04-27 13:41:12 +02:00
Petr Skoda
f0202ae9a2
MDL-30686 improve accuracy of qualified_me() by trying PAGE->url first
...
This should help SSL proxies and returning to current page after require_login().
2012-04-27 13:39:18 +02:00
Dan Poltawski
f488088109
Merge branch 'w17_MDL-32569_m23_phpunit5' of git://github.com/skodak/moodle
2012-04-23 11:21:06 +08:00
Petr Skoda
bc5c10f69e
MDL-32575 import latest Typo3 libs for textlib and other improvements
...
Includes new textlib reset, new test for faulty integer lower/upper casing.
2012-04-21 21:31:03 +02:00
Petr Skoda
4ca04fb58b
MDL-32569 remove remaining references to simpletest and improve events test
2012-04-21 17:08:30 +02:00
Petr Skoda
d7b44d5e95
MDL-32377 do not rewrite on-disk string cache when double checking if string really does not exist in get_string()
...
This should help with performance on production sites and may indirectly resolve race condition problems in MDL-31904.
2012-04-16 23:58:50 +02:00
Petr Skoda
ea7d4b0972
MDL-32377 do not store incomplete component strings without local packs in on-disk string cache
2012-04-16 23:55:35 +02:00
Petr Skoda
0c5406ca93
MDL-32293 move the upgrade_set_timeout() function to lib/upgradelib.php
...
Credit goes to Eloy Lafuente.
2012-04-09 18:14:27 +02:00
Dan Poltawski
a973d320f1
Merge branch 'MDL-20438-update-notification' of git://github.com/mudrd8mz/moodle
2012-04-04 11:17:43 +08:00
Eloy Lafuente (stronk7)
2000cd85da
Merge branch 'w14_MDL-32149_m23_phpunit2' of git://github.com/skodak/moodle
2012-04-04 01:32:15 +02:00
Eloy Lafuente (stronk7)
eeb3295fd8
Merge branch 'wip-MDL-32265-m23' of git://github.com/samhemelryk/moodle
2012-04-03 23:59:07 +02:00