moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 19:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66543 commits 37 branches 544 tags 1.3 GiB
Commit graph

66543 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marina Glancy
14df84f65e Merge branch 'MDL-45288_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-04-28 13:49:02 +08:00
David Monllao
d15809bb81 MDL-45156 behat: Changing html_writer::empty_tag for start_tag 
Credits to Daniele Cordella.
 2014-04-28 12:30:35 +07:00
Marina Glancy
7ca387b3cf Merge branch 'MDL-44614_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-04-28 13:04:08 +08:00
Andrew Nicols
29fe6d8155 MDL-45221 admin: configexecutable admin settings should only accept files 2014-04-28 12:21:42 +08:00
Frederic Massart
0d84ac90bf MDL-45229 event: Validate sectionnum in course_section_updated 2014-04-28 11:40:54 +08:00
Jason Fowler
418cbf32ed MDL-44916 Question: Fixing alignment in bootstrap themes 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-28 11:38:39 +08:00
David Monllao
70cbedd4cf MDL-45288 behat: Restricting click to .logininfo 2014-04-28 10:27:45 +07:00
Marina Glancy
4f214c3b64 Merge branch 'MDL-44004-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-28 11:17:06 +08:00
Damyon Wiese
b7a172cc23 Merge branch 'MDL-45268-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 2014-04-28 10:52:46 +08:00
Marina Glancy
1f2e95e7eb Merge branch 'm26_MDL-45210' of git://github.com/totara/moodle into MOODLE_26_STABLE 2014-04-28 10:46:50 +08:00
Dan Poltawski
1a1cb928dd MDL-45266 behat: tests for login block 2014-04-28 10:45:39 +08:00
Sam Hemelryk
5701d152e5 Merge branch 'MDL-45164_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-04-28 14:09:29 +12:00
Sam Hemelryk
3638582c2f Merge branch 'MDL-45284_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-04-28 14:09:21 +12:00
Sam Hemelryk
2f9955d4cc Merge branch 'wip-MDL-45280-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-04-28 12:22:51 +12:00
Eloy Lafuente (stronk7)
9d3933d4ad MDL-45286 timezones: updated to 2014b 2014-04-28 01:01:56 +02:00
Yuliya Bozhko
40b34dc0e3 MDL-45079 badges: Remove user email address from badge page 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2014-04-28 10:05:58 +12:00
David Monllao
408c5347e7 MDL-44614 behat: Automate MDLQA-61 
In an Offline activity assignment, a teacher can
grade and give comments on an assignment completed
offline.
 2014-04-27 13:06:09 +07:00
David Monllao
80f0d099ee MDL-45164 behat: Automate MDLQA-1464 
A student can add submission comments to an
online text type assignment.
 2014-04-27 12:28:18 +07:00
David Monllao
fa5d2874b9 MDL-45165 behat: Automating MDLQA-20 
Database activity entries can be viewed in a list
or singly or they can be searched or browsed.
 2014-04-27 12:27:13 +07:00
David Monllao
689451731c MDL-45165 behat: Adding text selector 
Same behaviour than I should see step,
it looks for the text in the node + descendants,
but, to get the lower level match discards the
nodes with children that also contains the
same text.
 2014-04-27 12:27:13 +07:00
David Monllao
6dac47a69c MDL-45166 behat: MDLQA-18 converted to a behat scenario 
In a database activity, students can add
entries to a database.
 2014-04-27 12:26:22 +07:00
David Monllao
7eaa6e208b MDL-45166 behat: Steps to speed up mod_data features creation 
A step to add a field to a database and
another one to add a database entry.
 2014-04-27 12:26:22 +07:00
David Monllao
32aea6a84f MDL-45284 behat: Replace wrongly triggered not found exception 2014-04-27 11:57:03 +07:00
Marina Glancy
cf5b0a4be5 MDL-45280 wrtie default value for admin_setting_configstoredfile 
this fixes regression from MDL-45134
 2014-04-26 10:38:37 +08:00
Dan Poltawski
e374bfd61a MDL-45268 behat: tests for participants block 2014-04-25 16:21:27 +08:00
Dan Poltawski
eabcd76d4d weekly release 2.6.2+ 2014-04-24 17:56:49 +08:00
Dan Poltawski
e679eb6c27 Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-04-24 17:56:45 +08:00
Ankit Agarwal
a5657deada MDL-44398 tags: Fix incorrect usage of caps 2014-04-24 16:39:31 +08:00
Frederic Massart
2133c33314 MDL-44004 grading_rubric: Ensure that score is set before using it 2014-04-24 16:22:09 +08:00
Dan Poltawski
53318d684a Merge branch '45046-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-04-24 10:00:59 +08:00
Steve Clay
06a76addad MDL-45096 block_navigation: Check for existence of the siteadminbranch before modifying it 
Prevents JS errors in some themes when admin block is hidden
 2014-04-24 12:15:56 +12:00
Sam Hemelryk
291bb582ad Merge branch 'MDL-45124-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-04-24 11:03:22 +12:00
Sam Hemelryk
7b292552dd Merge branch 'MDL-45186-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-24 11:01:41 +12:00
Dan Poltawski
5d933a6abe Merge branch 'MDL-45172_block_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE 2014-04-23 16:40:26 +08:00
Dan Poltawski
4a85e96b97 Merge branch 'MDL-45075-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-04-23 16:18:14 +08:00
Andrew Nicols
07e57c28ea MDL-45075 mod_forum: Add unit tests for forum subscription on forum creation 2014-04-23 16:08:11 +08:00
Simon Coggins
3ccba78a57 MDL-45210: Fix broken link when plagiarism plugins are disabled 2014-04-23 19:45:16 +12:00
Marina Glancy
5db4854d64 Merge branch 'MDL-45134-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-23 14:46:16 +08:00
Dan Poltawski
e3986158bf Merge branch 'wip-MDL-45148-26' of https://github.com/mackensen/moodle into MOODLE_26_STABLE 2014-04-23 14:22:21 +08:00
Marina Glancy
b3799a8678 Merge branch 'MDL-44991-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE 2014-04-23 13:25:38 +08:00
Marina Glancy
b212e89231 Merge branch 'MDL-44855-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-04-23 13:13:56 +08:00
Frederic Massart
ffc6df1ba2 MDL-45134 adminlib: No more validation error when a config file is not set 
When the destination draft area existed and the user draft area has not
been used, and thus does not exist, an error was displayed to the user
saying that they could not save the setting.

This was intended to handle the cases where the draft area disappears
and would overwrite the content of the destination area, deleting
all its content. But now we do not prompt with an error when
overwriting empty with empty.
 2014-04-23 12:40:50 +08:00
Andrew Davis
b7055f89d4 MDL-45172 block_completionstatus: added a check for an empty string before appending 2014-04-23 11:42:05 +08:00
AMOS bot
cf12210cbe Automatically generated installer lang files 2014-04-23 00:38:07 +00:00
AMOS bot
9ae6b73caf Merge branch 'MOODLE_26_STABLE' into install_26_STABLE 2014-04-23 00:38:06 +00:00
AMOS bot
20b0dd3910 Automatically generated installer lang files 2014-04-22 11:15:12 +00:00
Eloy Lafuente (stronk7)
0afcad7c36 weekly release 2.6.2+ 2014-04-22 12:26:47 +02:00
Andrew Nicols
89b63282b4 MDL-44855 AJAX: Arrays and Objects should be defined in the initializer 
JavaScript is a prototypal language and complex types should be defined as
null in the prototype, and set up in the initializer instead.
 2014-04-22 17:06:08 +08:00
Andrew Nicols
6930901d9e MDL-45124 dndupload: Lowercase types when comparing 
IE helpfull uses a mixed-case version of 'Text' which fails the string
comparison. All other browsers use lowercase for their mime-types.
 2014-04-22 16:10:39 +08:00
Andrew Nicols
c07b42d7d8 MDL-40716 report_completion: Set RTL 2014-04-22 15:22:09 +08:00