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

70269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
7b2945b847 Merge branch 'MDL-46284-master-fix' of git://github.com/andrewnicols/moodle 2014-10-08 08:54:07 +01:00
Dan Poltawski
006c84f3e7 Merge branch 'MDL-40697_master_alt_usergraded' of https://github.com/markn86/moodle 2014-10-08 08:39:31 +01:00
Andrew Nicols
a6019c2910 MDL-46284 tool_messageinbound: Handle checkboxes correctly 
When a checkbox is not checked, it does not submit in the form, therefore
this must be an !empty() test instead of an (int) casting.

This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
 2014-10-08 15:19:17 +08:00
Marina Glancy
9f1088d482 MDL-47543 core_grades: behat changes, also MDL-47541 2014-10-08 15:03:37 +08:00
Marina Glancy
eb84b77923 MDL-47543 core_grades: improve navigation menu in grade administration 2014-10-08 15:03:36 +08:00
Marina Glancy
2be0d5c3ed MDL-47541 core_grades: hints about aggregation settings on setup page 
Also do not indicate 'Natural' aggregation method
 2014-10-08 15:03:32 +08:00
Frederic Massart
70e7b634e4 MDL-46481 backup: Reposition one-click backup button 2014-10-08 13:45:24 +08:00
Jean-Michel Vedrine
ce3cfc8f92 MDL-38540 Lesson: import images in question answers 2014-10-08 06:07:02 +02:00
Dan Poltawski
c5d4fd7ddf MDL-38106 lesson: fix tests introduced in MDL-32870 2014-10-08 11:51:21 +08:00
Mark Nelson
ba8024665d MDL-40697 mod_*: fixed unit tests so they pass 2014-10-07 19:08:35 -07:00
Mark Nelson
828b71d845 MDL-40697 core: added unit test for grade_deleted event 2014-10-07 19:08:35 -07:00
Mark Nelson
b310c9a1fe MDL-40697 core: added more unit tests for the user_graded event 2014-10-07 19:08:35 -07:00
Mark Nelson
2e0b3490f0 MDL-40697 core_grades: trigger the grade_deleted event 2014-10-07 19:08:35 -07:00
Mark Nelson
acd25c133c MDL-40697 core_grades: trigger the user_graded event 2014-10-07 19:08:35 -07:00
Mark Nelson
c09e6fa3e3 MDL-40697 core_grades: removed existing user_graded event triggers 2014-10-07 19:04:10 -07:00
Mark Nelson
3419a38980 MDL-40697 core_grades: changed user_graded event name 2014-10-07 19:04:10 -07:00
Mark Nelson
b0f844388b MDL-40697 core: added grade_deleted event 2014-10-07 19:04:09 -07:00
Damyon Wiese
140f46a238 MDL-28484 Libraries: Update comments to suggest using new is_https() 2014-10-08 09:54:05 +08:00
Damyon Wiese
0d474cb2b4 Merge branch 'MDL-28484-master' of https://github.com/lucisgit/moodle 2014-10-08 09:53:53 +08:00
Sam Hemelryk
ec39530d5f Merge branch 'wip_MDL-47477_m28_jqueryuitheme' of https://github.com/skodak/moodle 2014-10-08 14:35:02 +13:00
Andrew Nicols
7feac0aab6 MDL-46658 gradebook: Fix gradebook behat tests 
This issue is a part of the MDL-25544 Epic.
 2014-10-08 09:31:57 +08:00
Sam Hemelryk
6d3b83b9b4 Merge branch 'wip_MDL-47303_m28_jquery' of https://github.com/skodak/moodle 2014-10-08 14:31:40 +13:00
Sam Hemelryk
76d9337ced Merge branch 'MDL-47301-master' of git://github.com/FMCorz/moodle 2014-10-08 14:10:50 +13:00
Sam Hemelryk
9311301f44 Merge branch 'wip-MDL-47299-master' of git://github.com/marinaglancy/moodle 2014-10-08 14:07:57 +13:00
Eloy Lafuente (stronk7)
278432258f MDL-47509 Profile restriction: More oracle/text fixes 
1) Get rid of "uid" that is a reserved word.
2) Add cross-db support for text columns in the get_condition_sql() method
   by adding a new, defaulting to false for BC param and intensively using
   the sql_compare_text() helper to build the correct sql fragments.
 2014-10-08 01:45:29 +02:00
sam marshall
9634c60e7b MDL-47509 Profile restriction: Broken Oracle causes problem 2014-10-08 01:45:28 +02:00
Sam Hemelryk
252bd39983 Merge branch 'MDL-47470-master' of git://github.com/danpoltawski/moodle 2014-10-08 12:21:31 +13:00
Sam Hemelryk
ba2f9a9695 Merge branch 'MDL-47132' of git://github.com/timhunt/moodle 2014-10-08 12:01:42 +13:00
Sam Hemelryk
13f60ffce1 Merge branch 'MDL-47474' of https://github.com/bostelm/moodle 2014-10-08 11:52:17 +13:00
Sam Hemelryk
28fffe1f9b Merge branch 'MDL-47481-master' of https://github.com/sammarshallou/moodle 2014-10-08 11:51:32 +13:00
Sam Hemelryk
15a4139506 Merge branch 'MDL-47484' of git://github.com/aolley/moodle 2014-10-08 11:40:49 +13:00
Sam Hemelryk
c5057d3ecc Merge branch 'MDL-47496-master' of git://github.com/danpoltawski/moodle 2014-10-08 11:37:24 +13:00
Sam Hemelryk
0ebe4f74aa Merge branch 'wip-MDL-40351-master' of https://github.com/marinaglancy/moodle 2014-10-08 11:36:01 +13:00
Sam Hemelryk
2b17072b59 Merge branch 'MDL-46182' of https://github.com/NeillM/moodle 2014-10-08 11:28:19 +13:00
Sam Hemelryk
c709fafc6e Merge branch 'MDL-47197-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2014-10-08 11:16:54 +13:00
Sam Hemelryk
70b370982f Merge branch 'MDL-47476' of git://github.com/timhunt/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2014-10-08 11:02:38 +13:00
Sam Hemelryk
0c1a1760fa Merge branch 'MDL-28075' of git://github.com/timhunt/moodle 2014-10-08 10:57:15 +13:00
Sam Hemelryk
be8989065c Merge branch 'MDL-46391-master' of https://github.com/DmitryNefedov/moodle 2014-10-08 10:45:23 +13:00
Sam Hemelryk
93fad868d9 Revert "MDL-46978 gradebook: Edit grade item changes visibility of category" 
This reverts commit bad2c9b14f27e6d9a370ac6cff6b8b5c2dc79a17.
 2014-10-08 10:37:12 +13:00
Sam Hemelryk
e90a0396e1 MDL-3714 mod_forum: pre-integration clean up 2014-10-08 09:39:44 +13:00
Sam Hemelryk
82d9aebc7d Merge branch 'MDL-3714-master' of git://github.com/andrewnicols/moodle 2014-10-08 09:39:01 +13:00
Dan Poltawski
99675668b4 Merge branch 'MDL-45893-master-v3' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-10-07 16:52:07 +01:00
Jetha Chan
854a647e62 MDL-45893 user_menu: responsive approach; fixed minor issues 2014-10-07 23:31:47 +08:00
Dan Poltawski
409318eeff Merge branch 'MDL-47518' of https://github.com/rlorenzo/moodle 2014-10-07 14:32:48 +01:00
Dan Poltawski
c31f7c58c1 Merge branch '46481-28' of git://github.com/samhemelryk/moodle 2014-10-07 14:25:06 +01:00
Marina Glancy
850ac50a87 Merge branch 'MDL-32870' of git://github.com/jmvedrine/moodle 2014-10-07 17:16:56 +08:00
Dan Poltawski
08abbd61c2 Merge branch 'wip-MDL-35618-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-10-07 09:24:39 +01:00
Frederic Massart
26331e3d17 MDL-46647 core_grades: Adding tests for fetch_all_helper() 2014-10-07 15:23:05 +08:00
Damyon Wiese
4a813f3959 Merge branch 'wip-MDL-36014-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2014-10-07 12:34:34 +08:00
Sam Hemelryk
94cdabcdee Merge branch 'MDL-46284-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2014-10-07 16:28:50 +13:00