mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-04 08:06:30 +01:00
Code Issues Projects Releases Wiki Activity
64,284 Commits 36 Branches 523 Tags
Commit Graph

64284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
370058d8fb Merge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	lib/upgrade.txt
 2013-10-10 10:49:11 +08:00
Dan Poltawski
00ae230f52 Merge branch 'MDL-41379_outcomes' of https://github.com/andyjdavis/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-10-10 10:31:44 +08:00
Marina Glancy
0965a9be10 Merge branch 'MDL-37153_master' of https://github.com/pauln/moodle 2013-10-10 12:52:28 +11:00
Sam Hemelryk
c80ef689d5 Merge branch 'wip-mdl-41744' of https://github.com/rajeshtaneja/moodle 2013-10-10 14:40:02 +13:00
Damyon Wiese
f0ae8d7a66 Merge branch 'MDL-38196-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	backup/backup.php
	theme/bootstrapbase/style/moodle.css
 2013-10-10 09:31:33 +08:00
Damyon Wiese
80d5b253e2 Merge branch 'MDL-42091-master' of git://github.com/phalacee/moodle 2013-10-10 09:11:25 +08:00
Jason Fowler
8bcd5ddeab MDL-42091 atto - fixing on hover and active states of buttons 2013-10-10 09:05:47 +08:00
Marina Glancy
44cd0b03af Merge branch 'wip-mdl-38155' of git://github.com/rajeshtaneja/moodle 2013-10-10 11:23:06 +11:00
Dan Poltawski
e077f21827 Merge branch 'wip-MDL-42020-master' of git://github.com/marinaglancy/moodle 2013-10-10 08:18:28 +08:00
Marina Glancy
9c5d6183d5 Merge branch 'MDL-42143-master' of git://github.com/danpoltawski/moodle 2013-10-10 11:12:35 +11:00
Marina Glancy
bf1405a60a MDL-42020 course: performance improvement in course listings 
- better performance when get_course_count() OR search_course_count() are called by themselves
- better performance in displaying course contacts
 2013-10-10 10:51:16 +11:00
Dan Poltawski
c08f914799 Merge branch '42057-26' of git://github.com/samhemelryk/moodle 2013-10-10 07:20:18 +08:00
Marina Glancy
9e4561b2f2 Merge branch 'MDL-41993-master-fix1' of git://github.com/damyon/moodle 2013-10-10 09:36:30 +11:00
Sam Hemelryk
2dc15b1011 Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle 2013-10-10 08:37:03 +13:00
Sam Hemelryk
2219f50a10 Merge branch 'MDL-32188' of git://github.com/timhunt/moodle 2013-10-10 08:34:11 +13:00
Eric Merrill
ff715cc936 MDL-41940 files Fixes for behat tests 
Commented out second test pending MDL-42013 visibiliy checking.
 2013-10-09 07:47:11 -04:00
Dan Poltawski
54cd84c84b Merge branch 'w41_MDL-42054_m26_phpmailertesting_i' of https://github.com/skodak/moodle 2013-10-09 18:16:56 +08:00
Petr Škoda
90930acff8 MDL-42054 fix incorrect email redirection in unit tests 2013-10-09 12:08:55 +02:00
Dan Poltawski
f57053fc2a Merge branch 'wip-mdl-42222' of git://github.com/rajeshtaneja/moodle 2013-10-09 17:23:44 +08:00
Dan Poltawski
c1636aea88 Merge branch 'MDL-40493-master-fix1' of git://github.com/damyon/moodle 2013-10-09 17:01:10 +08:00
Dan Poltawski
117111b78b Merge branch 'MDL-39776-master' of git://github.com/phalacee/moodle 2013-10-09 16:54:02 +08:00
Rajesh Taneja
9dbe0313ce MDL-42222 Assignment: Added type check before checking mimetype 
Online submission type pass string in files, so added check
to see if file is of type stored_file then check mimetype
 2013-10-09 16:53:46 +08:00
Damyon Wiese
6e4dcb9a47 MDL-40493 Question: Explain why setAdminUser is needed for tests 2013-10-09 16:53:21 +08:00
Dan Poltawski
07b0214588 Merge branch 'm26_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-10-09 16:46:56 +08:00
Dan Poltawski
bbe834a152 Merge branch 'MDL-41986-master' of git://github.com/andrewnicols/moodle 2013-10-09 16:28:53 +08:00
Dan Poltawski
c58b3ca0ca Merge branch 'MDL-41985-master' of git://github.com/andrewnicols/moodle 2013-10-09 16:27:50 +08:00
Tim Hunt
e9af46d8e7 MDL-32188 fix type in question/engine/upgrade.txt 2013-10-09 09:14:24 +01:00
Damyon Wiese
c778085550 Merge branch 'w41_MDL-42047_m26_cohortdel' of https://github.com/skodak/moodle 2013-10-09 14:42:23 +08:00
Damyon Wiese
4600853128 Merge branch 'MDL-41659_master' of https://github.com/totara/openbadges 2013-10-09 13:30:40 +08:00
Damyon Wiese
6412c972e3 Merge branch 'wip-MDL-41967-master' of git://github.com/abgreeve/moodle 2013-10-09 12:46:14 +08:00
Damyon Wiese
c2a2580ac9 Merge branch 'wip-MDL-40844-master' of git://github.com/abgreeve/moodle 2013-10-09 12:09:10 +08:00
Damyon Wiese
5cc2c6662d Merge branch 'MDL-41347-master' of git://github.com/FMCorz/moodle 2013-10-09 12:03:54 +08:00
Damyon Wiese
604fc45ee0 Merge branch 'wip-MDL-42098-master' of git://github.com/abgreeve/moodle 2013-10-09 11:48:14 +08:00
Jason Fowler
614119163f MDL-39776 Javascript - enable formautosubmit from a select box on android 2013-10-09 11:36:13 +08:00
Sam Hemelryk
d00b3f19b9 Merge branch 'MDL-40046-master' of git://github.com/ankitagarwal/moodle 2013-10-09 16:25:22 +13:00
Ankit Agarwal
136f4c47b3 MDL-40046 events: Use correct variable for page instance id 2013-10-09 11:20:32 +08:00
Dan Poltawski
e521e0724e Merge branch 'MDL-41230-master' of git://github.com/FMCorz/moodle 2013-10-09 11:16:34 +08:00
Damyon Wiese
103ba42d84 MDL-41993 Atto: Always clean/update the textarea when the content is changed 2013-10-09 11:08:06 +08:00
Sam Hemelryk
f18f96f767 Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2013-10-09 15:58:45 +13:00
Paul Nicholls
0d64c75fb2 MDL-37153 - assign: Obey grade display settings in submission status 
The assignment submission status screen was ignoring the grade item's
display setting, showing scores even if it's set to display letters only.
 2013-10-09 15:56:52 +13:00
Dan Poltawski
e9091a28f5 Merge branch 'wip-MDL-42089-master' of git://github.com/abgreeve/moodle 2013-10-09 10:54:24 +08:00
Dan Poltawski
9d841c6c90 Merge branch 'mdl41908-master' of https://github.com/tlock/moodle 2013-10-09 10:27:07 +08:00
Damyon Wiese
869dd1fc6c Merge branch 'MDL-29663_alt' of https://github.com/merrill-oakland/moodle 2013-10-09 09:39:09 +08:00
Eloy Lafuente (stronk7)
7e9dadfd99 Merge branch 'MDL-42026-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2013-10-09 01:48:45 +02:00
Sam Hemelryk
571781fbf6 Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle 2013-10-09 12:41:36 +13:00
Eloy Lafuente (stronk7)
8fe9bbde09 Merge branch 'MDL-41761-master' of git://github.com/jamiepratt/moodle 2013-10-09 01:29:17 +02:00
Eloy Lafuente (stronk7)
38c6dc4313 Merge branch 'wip-MDL-42068-m26-showshortnamefilepicker' of git://github.com/henesnarfel/moodle 2013-10-09 01:26:52 +02:00
Petr Škoda
c969753885 MDL-40493 question: set real $USER before testing question walktrough 2013-10-09 11:02:35 +13:00
Petr Škoda
ed661154de MDL-41792 fix calendar test typos 2013-10-08 23:08:27 +02:00
Sam Hemelryk
08f95ac5e5 Merge branch 'w41_MDL-16073_m26_extdbtest_i' of https://github.com/skodak/moodle 2013-10-09 09:23:53 +13:00