ac4c7aed68
Merge branch 'w51_MDL-35356_m25_excel' of git://github.com/skodak/moodle
...
Conflicts:
lib/odslib.class.php
2013-01-08 23:11:54 +01:00
f44e7d0a77
Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
...
Conflicts:
user/view.php
2013-01-09 09:34:22 +13:00
70601b9433
Merge branch 'w51_MDL-21342_m25_lockout' of git://github.com/skodak/moodle
2013-01-08 10:56:39 +13:00
dd89f61e68
Merge branch 'w51_MDL-29996_m25_oldfilters' of git://github.com/skodak/moodle
2013-01-07 15:22:37 +13:00
8e7591654a
MDL-35356 improve worksheet exports
...
This patch removes deprecated PEAR excel export lib in favour of newer PHPExcel,
the ODS exporter implementation is finished and a test script is included.
The default Excel format is now 2007, file extension is changed automatically
to match excel format.
2013-01-06 18:15:20 +01:00
b28247fe90
MDL-21342 add user login lockout
2013-01-04 15:12:31 +01:00
0662bd677c
MDL-29996 remove deprecated stuff from filter code
2012-12-30 17:02:18 +01:00
7539894649
MDL-36212 rework html entity conversions
...
This should resolve all html entity conversion problems in different PHP versions.
2012-12-20 22:47:16 +01:00
b93e0af3fe
Revert "MDL-36704: wrap pending conditions in span tags"
...
This reverts commit 5e9fd83df8
2012-12-20 08:45:04 +08:00
917169221f
Merge branch 'w50_MDL-36245_m25_convert' of git://github.com/skodak/moodle
2012-12-18 23:41:48 +01:00
86575fa709
Merge branch 'MDL-36704-master' of git://github.com/sammarshallou/moodle
2012-12-18 14:57:43 +08:00
04463c0ea6
MDL-36245 add tests for the buggy utf-8 to utf-8 conversion
2012-12-15 11:50:17 +01:00
8158ce79f9
MDL-36773 timezone inconsistency => some number support decimal other don\'t - Original patch author: Nathan Mares
2012-11-30 10:11:55 +08:00
5e9fd83df8
MDL-36704: wrap pending conditions in span tags
2012-11-22 10:42:10 +00:00
020e338dee
Merge branch 'w47_MDL-36701_m24_composer' of git://github.com/skodak/moodle
2012-11-22 16:23:20 +08:00
3a7bc16ad7
MDL-36701 support for PHPUnit installation via Composer packaging system
...
See http://getcomposer.org/doc/00-intro.md
2012-11-20 11:27:35 +01:00
430f5aaac0
Merge branch 'MDL-36646' of git://github.com/timhunt/moodle
2012-11-20 15:06:21 +08:00
f28af1dd13
MDL-36229 whitelist more search engines and add tests
2012-11-17 10:37:51 +01:00
716330444a
MDL-36471 phpunit: Fixed failure because SVG support was dropped for Opera
2012-11-16 12:12:54 +08:00
e70b050838
MDL-36646 unit tests should not assume number of contexts.
2012-11-15 14:41:00 +00:00
491391873e
Merge branch 'MDL-36061_userid' of git://github.com/andyjdavis/moodle
2012-11-15 14:32:51 +08:00
244e907235
Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle
...
Conflicts:
lib/tests/statslib_test.php
2012-11-15 11:15:00 +08:00
69bcca5e9c
MDL-36061 core_grade: added some unit tests related to refresh_grades()
2012-11-15 11:14:21 +08:00
0e35ba6ffc
MDL-36357 cleanup - remove double semicolons
2012-11-15 09:51:26 +08:00
12ccfc123a
MDL-30643 - Improved error reporting for daily stats tests.
2012-11-13 10:37:25 -05:00
dcb28e6e7f
MDL-30643 - Fixed timezone problems in test cases.
...
resolved integration time changes conflict.
Conflicts:
lib/tests/statslib_test.php
2012-11-13 13:58:31 +08:00
b0ba493cd0
Merge branch 'MDL-30545' of git://github.com/timhunt/moodle
2012-11-13 13:21:50 +08:00
67690cfa92
MDL-30643 - Fixed timezone problems in test cases.
2012-11-12 22:47:09 -05:00
9540a7d0b8
MDL-30643 statslib test - remove using $CFG->timezone=99 for unit test as it clashes with test data in other tz
2012-11-13 00:49:21 +08:00
6b1a2e4a0d
MDL-30643 fixed statslib test start timestamp
2012-11-12 14:46:23 +08:00
79fc5f5294
Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle
2012-11-12 14:29:45 +08:00
c0f00c5fba
MDL-30643 - Added statslib test file.
...
- Tests daily stats and daily stats related functions.
2012-11-09 16:27:25 -05:00
3c1405a1ee
MDL-36481 improve IE version sniffing
2012-11-09 15:23:22 +01:00
3daedb5c5a
MDL-35238 Implement deployment authorization
...
The caller of the mdeploy.php utility is expected to create a file in
the data directory. The name of such file and the passphrase in it are
then sent to mdeploy.php as a part of the request. The submitted and
stored values are then compared.
2012-11-08 22:33:07 +01:00
7683e550ac
MDL-35238 Introduce available_update_deployer class
...
This class represents the communication bridge from Moodle UI to the
(standalone) mdeploy.php utility. It consists of various helper methods
useful when dealing with user interface, update confirmation etc.
The class is implemented as a singleton. This allows us easily
transfer required data from top level scripts (like /admin/index.php)
into the rendering methods deep in the stack without the need to change
the API of many methods on the way.
2012-11-08 22:33:06 +01:00
64f7d154db
Merge branch 'wip-MDL-36113-master' of git://github.com/abgreeve/moodle
...
Conflicts:
lib/tests/csvclass_test.php
2012-11-07 15:40:06 +08:00
13041f2125
MDL-36113 - lib: Unit tests for importing csv files with empty lines in the middle of the file.
2012-11-07 15:34:36 +08:00
1383b1f29a
Merge branch 'wip-MDL-36365-master' of git://github.com/abgreeve/moodle
2012-11-07 14:09:25 +08:00
1222dc52e1
MDL-36365 - lib: The csv class now reads tab separated files with tabs at the end of the file.
2012-11-07 14:02:39 +08:00
086f5f9ea8
MDL-35762 whitespace fix
2012-11-06 17:03:57 +01:00
278714a012
MDL-35762 fix deprecated use of get_fast_modinfo() reset.
2012-11-06 16:37:43 +01:00
cd59310d1b
Merge branch 'MDL-35762_fix' of git://github.com/andyjdavis/moodle
2012-11-06 16:13:47 +01:00
69632d42f0
MDL-35762 core_grade: adding unit tests for modinfolib.php
2012-11-05 09:35:10 +08:00
3bd6e74afd
Merge branch 'w42_MDL-35469_m24_geckover' of git://github.com/skodak/moodle
2012-11-02 12:07:11 +08:00
6ba8a4bee2
MDL-30545 messaging prefs: add Andy's extra unit tests.
2012-10-23 18:41:43 +08:00
2cf5ab1028
MDL-30545 messaging prefs: show all relevant message providers.
...
Some message providers have an associated capability. For example
the mod/quiz:emailconfirmsubmission capability. At the moment,
we only show the preferences for the capabilities that the user
has in the system context.
That does not work for the example capability above. Typically
the capability will be overridden in one quiz, to allow for
Students, and the user will have the Student role in the course
context. Therefore, this message type does not appear on the
preferences page.
This fix corrects the logic, so that all message types that are
to the current user are displayed.
2012-10-23 18:41:43 +08:00
a896bc32cd
Merge branch 'MDL-35412-master' of git://github.com/FMCorz/moodle
2012-10-16 17:41:49 +08:00
a8397303d2
MDL-35412 phpunit: date_format_string() is case insensitive
2012-10-16 17:21:11 +08:00
ac088b1c21
Merge branch 'w42_MDL-35904_m24_mainadmin' of git://github.com/skodak/moodle
2012-10-16 14:50:30 +08:00
44aa854e93
MDL-35339 coding style corrections
2012-10-15 16:57:25 +08:00
Eloy Lafuente (stronk7)