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

66603 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Hemelryk
ff6a130dcd Merge branch 'MDL-45312_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-04-29 10:24:23 +12:00
Sam Hemelryk
d1b900ea92 Merge branch 'MDL-45221-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-04-29 09:10:12 +12:00
Tim Hunt
1be0a4c812 MDL-45312 qtype_missingtype or qbehaviour_missing cannot be uninstalled. 
They are required by the system.
 2014-04-28 21:46:13 +01:00
Sam Hemelryk
d6eb354664 Merge branch 'MDL-45229-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-04-29 08:40:20 +12:00
Marina Glancy
93b2d3baca Merge branch 'w18_MDL-45287_m26_dbreset' of git://github.com/skodak/moodle into MOODLE_26_STABLE 2014-04-28 20:18:19 +08:00
Marina Glancy
795fb4aea4 Merge branch 'MDL-45266-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 2014-04-28 18:02:36 +08:00
Marina Glancy
7b6bdc91e9 Merge branch 'MDL-45156_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-04-28 18:02:25 +08:00
Petr Skoda
2e123e7120 MDL-45287 fix behat database reset between scenarios 
We cannot find out if DB received any writes because behat
web access runs in different request.

This was affecting only scenarios without generators.
 2014-04-28 17:13:29 +08:00
Damyon Wiese
f91bf9a768 Merge branch 'MDL-45079_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE 2014-04-28 17:08:12 +08:00
Jetha Chan
1a039ee822 MDL-45292 filepicker: fixed border style 
Fixed base style issues on RTL.
 2014-04-28 15:55:27 +08:00
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