mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-13 20:36:42 +01:00
Code Issues Projects Releases Wiki Activity
53,388 Commits 36 Branches 523 Tags
Commit Graph

53388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
3359a6fe07 Merge branch 'w20_MDL-32926_m23_phpunitevil' of git://github.com/skodak/moodle 2012-05-14 13:36:11 +08:00
Dan Poltawski
ae745307ef Merge branch 'w20_MDL-32960_m23_phpunitref' of git://github.com/skodak/moodle 2012-05-14 13:32:18 +08:00
Frederic Massart
6189c7b4d3 MDL-32978 Gradebook: Fix strict standards notices 2012-05-14 13:27:06 +08:00
Dan Poltawski
a271c57af8 Merge branch 'wip-MDL-32611-m23' of git://github.com/samhemelryk/moodle 2012-05-14 13:12:53 +08:00
Dan Poltawski
950632673b Merge branch 'MDL-32875-master-1' of git://git.luns.net.uk/moodle 2012-05-14 13:08:40 +08:00
Jonathon Fowler
ef8c793d74 MDL-31804 duplicated columns cause Oracle error in grader report 2012-05-14 11:00:29 +07:00
Damyon Wiese
3b6bbd767b MDL-32902: Remove 70% width stylesheet rule for tables on the mod_assign submission screen. 2012-05-14 11:39:42 +08:00
Sam Hemelryk
dfb597b447 Merge branch 'MDL-31134-master' of git://github.com/ankitagarwal/moodle 2012-05-14 15:36:55 +12:00
Damyon Wiese
12945803b8 MDL-32904: Fix incorrect call to update_record (not causing an error) 2012-05-14 11:34:08 +08:00
Damyon Wiese
b11808c7d6 MDL-32909: assign_user_get_grades does not need to lookup context and was doing it wrong 
cmidnumber is not the same as coursemodule->id
 2012-05-14 11:29:43 +08:00
Damyon Wiese
c45261df97 MDL-32933: Add outcomes to mod_assign and upgrade tool 2012-05-14 11:23:40 +08:00
Jonathon Fowler
0eefca3b66 MDL-32863 question: fix for Oracle ambiguous column error 2012-05-14 12:52:58 +10:00
Sam Hemelryk
86558590a4 Merge branch 'MDL-31944' of git://github.com/ankitagarwal/moodle 2012-05-14 14:52:10 +12:00
Dan Poltawski
bb30328fe1 Merge branch 'w20_MDL-26553_m23_sqlsrvconfig' of git://github.com/skodak/moodle 2012-05-14 10:49:52 +08:00
Sam Hemelryk
edd25271c4 Merge branch 'MDL-30305-master-1' of git://git.luns.net.uk/moodle 2012-05-14 14:48:31 +12:00
Dan Poltawski
e87a7c65f1 Merge branch 'MDL-32714-rubric' of git://github.com/mudrd8mz/moodle 2012-05-14 10:41:46 +08:00
Sam Hemelryk
f98a3833b9 Merge branch 'w20_MDL-32659_m23_navcourses' of git://github.com/skodak/moodle 2012-05-14 14:37:51 +12:00
Dan Poltawski
41ea0d3cc2 Merge branch 'MDL-31902-master' of git://github.com/ankitagarwal/moodle 2012-05-14 10:28:05 +08:00
Rossiani Wijaya
1dedecf260 MDL-30291 outputrenderers: fixed typo for 2012-05-14 10:25:05 +08:00
Dan Poltawski
85c85b8102 Merge branch 'MDL-27322_export' of git://github.com/andyjdavis/moodle 2012-05-14 10:22:21 +08:00
Dan Poltawski
2edce32ad4 Merge branch 'MDL-32910' of git://github.com/timhunt/moodle 2012-05-14 10:10:03 +08:00
Sam Hemelryk
04d7103804 Merge branch 'MDL-32340-master-2' of git://git.luns.net.uk/moodle 2012-05-14 14:04:21 +12:00
Sam Hemelryk
924c34df8c MDL-32873 course: Fixed up unused global + phpdocs 2012-05-14 13:41:15 +12:00
Sam Hemelryk
1c0441bd6a Merge branch 'MDL-32873-master-1' of git://git.luns.net.uk/moodle 
Conflicts:
	course/lib.php
 2012-05-14 13:39:55 +12:00
Sam Hemelryk
8ec7c2cfd9 Merge branch 'MDL-32881-master-2' of git://git.luns.net.uk/moodle 2012-05-14 13:30:16 +12:00
Sam Hemelryk
c96e613c66 Merge branch 'wip-MDL-32126-master' of git://github.com/abgreeve/moodle 2012-05-14 13:20:07 +12:00
Adrian Greeve
0ba303e85f MDL-32126 - data - Fix of an error when sorting by other criteria. 2012-05-14 07:27:01 +08:00
Sam Hemelryk
fe579c15b7 MDL-32611 editcategory: Fixed up navigation error. 2012-05-14 09:16:43 +12:00
Sam Hemelryk
6669b8e91e MDL-32872 tool_roles: Fixed up navigation on user roles page 2012-05-14 08:54:50 +12:00
Mary Evans
b87ac3867e MDL-31719 lang/en/admin.php: changed text in $string['configallowthemechangeonurl'] to make less ambiguous 2012-05-13 14:40:30 +01:00
Petr Skoda
246c8d497c MDL-26553 add sqlsrv to list of available db types in config-dist.php 2012-05-13 14:28:25 +02:00
Petr Skoda
c1592e514f MDL-25197 add existing InnoDB engine detection in conversion tool 2012-05-13 13:54:35 +02:00
Petr Skoda
99a5cd78ec MDL-29054 add sqlsrv to list dbtransfer targets, remove unfinished sqlite support 2012-05-13 12:28:19 +02:00
Petr Skoda
0739e690ee MDL-32967 add diagnostic strings for missing Microsoft drivers for SQL Server 2012-05-13 12:21:04 +02:00
Petr Skoda
7edfd54fcf MDL-32915 fix bogus open div in basic chat ui 2012-05-13 10:24:43 +02:00
Petr Skoda
ed7259d112 MDL-32923 on failure print hint how to execute the failed test case 2012-05-13 09:56:57 +02:00
Petr Skoda
b136a25b16 MDL-32961 try to use native grep when searching for DONOT...COMMIT tags 2012-05-12 23:05:42 +02:00
Petr Skoda
d59ef9c5ab MDL-32926 exorcise setUser(2) evil from phpunit 2012-05-12 21:42:07 +02:00
Petr Skoda
08ad325702 MDL-32960 put phpunit integration tests to one test suite and execute them first 2012-05-12 21:33:23 +02:00
Petr Skoda
7e7cfe7a03 MDL-32960 refactor phpunit integration to one class per file structure 2012-05-12 20:53:48 +02:00
Petr Skoda
db990d3a47 MDL-32830 add new hidden yuidebug setting for module backtraces 2012-05-12 17:06:45 +02:00
Petr Skoda
ed63f7f883 MDL-32907 prevent sql_like() backslash quoting problems in PostgreSQL 2012-05-12 16:40:11 +02:00
Petr Skoda
64b0f3ab68 MDL-32868 fix iplookup inconsistencies and add missing unit tests 
Please note you need to define PHPUNIT_LONGTEST in config.php or phpunit.xml to get the tests to execute because it takes long time to fetch the geoip data and we do not want to DDOS geoPlugin server.
 2012-05-12 14:25:01 +02:00
Petr Skoda
fca2d3d754 MDL-32659 potential navigation course loading improvements 
The idea is to not use inequalities in SQL queries for loading of courses in navigation because ti seems some SQL query optimiser have problems with that.
 2012-05-12 13:20:11 +02:00
David Mudrak
d20bffa2fd MDL-32714 workshop: fixed SQL to load assessment form fields 
Obvious problems emerged once there were some records in the
workshopform_rubric table with no workshopform_rubric_levels. As l.id
(empty in that case) was used as the key of the returned array, they all
were collapsed into a single one.
 2012-05-12 10:27:34 +02:00
Petr Skoda
1fea5537d4 MDL-26901 add new option to specify list of available fonts in TinyMCE 
Also modified the list of languages appearance, textarea is more suitable for entry of long texts. It is now also possible to specify empty list of languages and fonts which removes the button from the editor toolbar. Includes release name fix.
 2012-05-11 22:12:32 +02:00
Tim Hunt
62a3bfb37e MDL-32633 quiz editing: recreate grade item when max changed from 0 2012-05-11 20:23:37 +01:00
Tim Hunt
6cdef715df MDL-32375 question unit tests: fix breakage from phpunit coversion. 
Three things:

1. Fixes to select expectation.

2. Fixes to match walkthrough tests (No idea how these managed to pass
under Simpletest!)

3. Fix expected values for multianswer upgrade tests.
 2012-05-11 14:59:58 +01:00
Eloy Lafuente (stronk7)
71d7bc34a8 weekly release 2.3dev 2012-05-11 12:18:06 +02:00
Eloy Lafuente (stronk7)
28f7bbb0c8 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-05-11 12:10:16 +02:00