mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
60,681 Commits 36 Branches 519 Tags
Commit Graph

60681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
e6c7a5887b Merge branch 'MDL-38938_master' of git://github.com/dmonllao/moodle 2013-04-09 23:43:46 +02:00
Eloy Lafuente (stronk7)
3621633194 Merge branch 'MDL-38950_master' of git://github.com/dmonllao/moodle 2013-04-09 23:42:59 +02:00
Matteo Scaramuccia
67dfcb3df6 MDL-39061 Cache: (trivial) incorrect MD sublisting 2013-04-09 23:40:18 +02:00
Eloy Lafuente (stronk7)
8516f270c6 Merge branch 'MDL-38954_master' of git://github.com/dmonllao/moodle 2013-04-09 23:30:43 +02:00
Eloy Lafuente (stronk7)
696facb159 Merge branch 'MDL-38952_master' of git://github.com/dmonllao/moodle 2013-04-09 23:30:30 +02:00
Eloy Lafuente (stronk7)
b896844942 Merge branch 'MDL-38953_master' of git://github.com/dmonllao/moodle 2013-04-09 23:29:59 +02:00
Eloy Lafuente (stronk7)
5bd80500f2 Merge branch 'MDL-38942_master' of git://github.com/dmonllao/moodle 2013-04-09 23:13:44 +02:00
Eloy Lafuente (stronk7)
d2f77303b0 Merge branch 'MDL-38969_master' of git://github.com/dmonllao/moodle 2013-04-09 23:13:32 +02:00
Eloy Lafuente (stronk7)
a9aa326ea9 Merge branch 'MDL-38967_master' of git://github.com/dmonllao/moodle 2013-04-09 23:13:21 +02:00
David Mudrák
5be1be85f4 MDL-39059 Set explicit boolean type of a hidden field in workshop random allocator form 2013-04-09 21:46:18 +02:00
Eloy Lafuente (stronk7)
6bb78aedee Merge branch 'MDL-38945_master' of git://github.com/dmonllao/moodle 2013-04-09 20:24:17 +02:00
Eloy Lafuente (stronk7)
d06700cbd6 Merge branch 'MDL-38944_master' of git://github.com/dmonllao/moodle 2013-04-09 20:23:38 +02:00
Eloy Lafuente (stronk7)
f7f8ca2420 Merge branch 'MDL-38943_master' of git://github.com/dmonllao/moodle 2013-04-09 20:22:59 +02:00
Eloy Lafuente (stronk7)
a2027b873b Merge branch 'MDL-38822_master' of git://github.com/dmonllao/moodle 2013-04-09 20:00:34 +02:00
Eloy Lafuente (stronk7)
c1fc4ba397 Merge branch 'MDL-38820_master' of git://github.com/dmonllao/moodle 2013-04-09 19:59:45 +02:00
Eloy Lafuente (stronk7)
26b7bea2c0 Merge branch 'MDL-39012_master' of git://github.com/dmonllao/moodle 2013-04-09 19:55:29 +02:00
Eloy Lafuente (stronk7)
275c2c9f8a Merge branch 'MDL-38965_master' of git://github.com/dmonllao/moodle 2013-04-09 19:40:39 +02:00
Eloy Lafuente (stronk7)
668aaeb8f3 MDL-26649 forms: temp disable problematic call 
The new version of the dateselector is causing JS to stop
working completely in a lot of forms, so I've disabled
temporarily the ofending call to allow other stuff to be
integrated and tested.
 2013-04-09 19:37:08 +02:00
sam marshall
fba5cbd356 MDL-39000 Conditional activities: Section condition restore errors 2013-04-09 17:42:32 +01:00
Eloy Lafuente (stronk7)
441b165c12 Merge branch 'MDL-39056-download-api-version' of git://github.com/mudrd8mz/moodle 2013-04-09 17:36:57 +02:00
David Mudrák
803738ea41 MDL-39056 Use new version of API when fetching available updates info 2013-04-09 17:07:30 +02:00
Eloy Lafuente (stronk7)
f57832826b Merge branch 'MDL-38792' of https://github.com/ppichet/moodle 2013-04-09 14:33:31 +02:00
Eloy Lafuente (stronk7)
77b0357faf MDL-38887 block nav: reshifter module 2013-04-09 10:28:24 +02:00
David Monllao
9bfdaaa541 MDL-38938 behat: New test 
According to MDLQA-38, a teacher can
choose whether to allow duplicate
entries in a glossary.
 2013-04-09 16:02:16 +08:00
David Monllao
00d373efc5 MDL-38938 behat: Step definition to add glossary entries 2013-04-09 16:01:43 +08:00
Dan Poltawski
ca0b1f57fc Merge branch 'wip-MDL-38442-m25' of git://github.com/samhemelryk/moodle 2013-04-09 15:39:57 +08:00
Damyon Wiese
92674e324e Merge branch 'MDL-26649_master' of https://github.com/markn86/moodle 2013-04-09 15:13:21 +08:00
David Monllao
3d7848c584 MDL-38950 behat: New tests 
According to MDLQA-1765, a selected
file can be cancelled. Also adding
a test for repository_recent.
 2013-04-09 15:02:11 +08:00
David Monllao
a2fd9c6fe4 MDL-38950 behat: Step definition to add files from recent files repo 2013-04-09 15:01:16 +08:00
David Monllao
0b297fdc37 MDL-38950 behat: File manager elements contextual menu 
Modified to work with both file manager elements
and file/folder elements inside modal windows.
 2013-04-09 14:59:31 +08:00
Dan Poltawski
ad84f8f9ac Merge branch 'w14_MDL-38927_m25_rolelocalisation' of git://github.com/skodak/moodle 2013-04-09 14:58:47 +08:00
Dan Poltawski
0ae1b8a294 Merge branch 'w14_MDL-39004_m25_roledocs' of git://github.com/skodak/moodle 2013-04-09 14:57:08 +08:00
Mark Nelson
f40df210ab MDL-26649 forms: added a calendar icon that will display the calendar pop-up when clicked rather than the select boxes triggering the event 2013-04-09 14:52:57 +08:00
Dan Poltawski
33815b4b7e Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle 2013-04-09 14:49:07 +08:00
Petr Škoda
6f55ce1893 MDL-38927 use role->localname to get real role name 2013-04-09 08:31:25 +02:00
Aparup Banerjee
45edc14126 Merge branch 'w14_MDL-38798_m25_php55' of git://github.com/skodak/moodle 2013-04-09 14:30:52 +08:00
Aparup Banerjee
eeb47dbd30 Merge branch 'wip-MDL-38887-m25' of git://github.com/marinaglancy/moodle 2013-04-09 14:21:22 +08:00
Marina Glancy
5f79b34b5e MDL-38682 removed auto page type, created issue MDL-39045 to address this 2013-04-09 16:16:21 +10:00
Damyon Wiese
bb18ec5e5b MDL-31969 Grader report - bump version for capabilities and settings. 2013-04-09 14:09:27 +08:00
Damyon Wiese
e497e90c76 Merge branch 'wip-mdl-31969' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	version.php
 2013-04-09 14:09:14 +08:00
Rajesh Taneja
38c1dd194d MDL-31969 grades: Added user preference to show/hide/export suspended users. 
User with course:viewsuspendedusers capability can now show/hide/export
enrolled users whose enrolment is suspended or enrolment time is expired.
 2013-04-09 14:01:58 +08:00
Damyon Wiese
10c56dc137 MDL-35608 Completion status block - use html_writer::link 
Just changing 2 calls from html_writer::tag to html_writer::link.
 2013-04-09 13:59:48 +08:00
Damyon Wiese
9adb30759f Merge branch 'wip-MDL-35608-master' of git://github.com/phalacee/moodle 2013-04-09 13:59:45 +08:00
Dan Poltawski
5331215459 Merge branch 'MDL-39005' of git://github.com/stronk7/moodle 2013-04-09 13:49:09 +08:00
Aparup Banerjee
163e0d3e70 Merge branch 'MDL-38508-m' of git://github.com/andrewnicols/moodle 2013-04-09 13:27:56 +08:00
Damyon Wiese
0180dfdede MDL-38865 Completion report: Version bump for css changes. 2013-04-09 13:21:04 +08:00
Damyon Wiese
67879710ee Merge branch 'MDL-38865-master' of https://github.com/mackensen/moodle 2013-04-09 13:20:52 +08:00
Dan Poltawski
224db0e83b Merge branch 'MDL-38981' of git://github.com/jmvedrine/moodle 2013-04-09 13:19:10 +08:00
Dan Poltawski
c64d2c0acd Merge branch 'wip-MDL-34346-master' of git://github.com/marinaglancy/moodle 2013-04-09 13:09:57 +08:00
Marina Glancy
0f232ed6e8 MDL-34346 fixed missing string and correct instantiating of repositories in tests 2013-04-09 14:40:15 +10:00