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

2258 Commits

Author SHA1 Message Date
David Monllao
3c26a30799 MDL-47835 block_recent_activity: Same entry keys order 
insert_records() is sensitive to the order of the keys
assigned to the inserted objects (inserted as arrays in
this case). Now keys are assigned using the same order.
 2014-10-29 10:54:11 +08:00
Sam Hemelryk
45ad1693cd MDL-47183 post-integration fixes 
* Fixed typo with context_module::instance
* Fixed use of $mod->get_context()
 2014-10-28 15:59:59 +13:00
Sam Hemelryk
77b31ba2ce Merge branch 'MDL-47183-master' of git://github.com/andrewnicols/moodle 2014-10-28 14:02:19 +13:00
Frederic Massart
00fd3c1aad MDL-47189 my: Fix the addition of default blocks to my/ page 
Fixing the upgrade script so that they attach the new blocks
to the right my_pages entry. An upgrade script has also been
added to fix the existing bad data.
 2014-10-14 16:03:12 +08:00
Helen Foster
7c8edb452e MDL-40351 course overview block: improved strings 2014-10-10 08:30:58 +01:00
Frederic Massart
dcb59c872c MDL-45893 my: Specifically follow My home from block in Behat tests 2014-10-08 16:59:41 +08:00
Andrew Nicols
f67b5c995e MDL-47183: viewhiddenactivities should use the module context 
Thanks to Paulo Matos for the forum part of this change.
 2014-10-06 12:21:49 +08:00
Marina Glancy
d512e5f833 MDL-40351 block_course_overview: minor corrections 2014-10-06 09:36:58 +08:00
Julien Boulen
076109dfbe MDL-40351 Blocks, My home: Course Categories on the My Home Page 2014-10-06 09:32:13 +08:00
Sam Hemelryk
525b6ebeb9 Merge branch 'MDL-47033_master' of https://github.com/totara/openbadges 2014-09-29 15:18:03 +13:00
Dan Poltawski
99e221f844 Merge branch 'MDL-40451-master-random-glossary-block-title' of git://github.com/amandadoughty/moodle 2014-09-08 17:26:56 +01:00
Dan Poltawski
7b41ee2752 Merge branch 'wip-MDL-43739-master' of git://github.com/marinaglancy/moodle 2014-09-08 15:16:38 +01:00
Marina Glancy
1302bb08f6 MDL-43739 block_course_overview: allow resorting of big number of courses 
previously an exception was thrown if the user preference exceeds 1333 chars
 2014-09-08 14:01:06 +08:00
Marina Glancy
d281dffa8d Merge branch 'MDL-46564_master' of https://github.com/totara/openbadges 2014-09-08 13:48:06 +08:00
Yuliya Bozhko
369484bf87 MDL-47033 general: Fix incorrect use of 'course' layout 
It should use 'incourse' layout in most cases

Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2014-09-05 09:25:43 +12:00
Amanda Doughty
48a3a4d621 MDL-40451 block/glossary_random Fixed missing header when adding new block 2014-09-03 14:01:54 +01:00
Yuliya Bozhko
2ffbf20715 MDL-46564 badges: Fix 'All' option in badges block 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2014-09-03 18:43:31 +12:00
Eloy Lafuente (stronk7)
5a249b20c4 Merge branch 'wip-MDL-30414-master' of https://github.com/mackensen/moodle 2014-09-03 01:08:17 +02:00
sam marshall
002ccdcf49 MDL-44725 Add Behat support for setting grouping condition (14) 
Makes it possible to add a grouping condition when creating an
activity, using the Behat field type API. You can set the field
using a syntax 'Grouping: NAME' (at present, only groupings are
supported, obviously we could potentially extend this to add
support for other conditions if needed).

Tested in Firefox and Chrome in JS mode, and in non-JS mode.
 2014-09-02 13:03:35 +01:00
Charles Fulton
b1931bf279 MDL-30414 block_private_files: convert button to inline link 2014-08-27 07:14:18 -07:00
Damyon Wiese
fff702acfd Merge branch 'MDL-45897_my2' of https://github.com/andyjdavis/moodle 2014-08-05 12:06:36 +08:00
Andrew Davis
7623260459 MDL-45897 blocks: added 3 new default blocks to /my 2014-08-05 08:44:21 +08:00
Andrew Nicols
cbed1284f4 MDL-43506 Blocks: Remove various deprecated functions 2014-08-04 08:44:50 +08:00
Marina Glancy
ef7c084b39 Merge branch 'm28_MDL-46325' of git://github.com/totara/moodle 2014-07-29 11:58:24 +08:00
Brian Barnes
3040963be3 MDL-46325 behat: Fixed issue where 'teacher1' didn't exist 2014-07-25 16:06:32 +12:00
Petr Skoda
1f5be49d65 MDL-46449 fix username prompt in login block when authloginviaemail enabled 2014-07-25 10:10:29 +12:00
Dan Poltawski
55d6361f5a MDL-46231 navigation: en_fix behat changes 2014-07-08 08:34:53 +01:00
Damyon Wiese
a084ac0db4 MDL-46045 Fix php tags (lowercase) everywhere 2014-06-19 11:05:16 +08:00
Sam Hemelryk
99f041ebfa MDL-45884 navigation: changed to positive setting phrasing 2014-06-13 10:16:25 +12:00
Sam Hemelryk
aab6438ca1 MDL-45884 navigation: tidied up code and added behat tests 2014-06-13 10:16:25 +12:00
Sam Hemelryk
36bb73449c MDL-45524 navigation: fixed non-expandable node behat tests 2014-06-09 09:34:05 +12:00
Sam Hemelryk
cbd063f4c3 MDL-44711 navigation: improved expandable course calculation 2014-06-09 09:34:05 +12:00
Eloy Lafuente (stronk7)
71fa28477b Merge branch 'MDL-44620_master' of git://github.com/dmonllao/moodle 2014-06-03 18:11:28 +02:00
Eloy Lafuente (stronk7)
f94891cc00 MDL-45503 upgrade: add v2.7.0 sep lines 2014-05-28 01:13:42 +02:00
Dan Poltawski
627a4619f5 Merge branch 'wip-MDL-45371-master' of git://github.com/marinaglancy/moodle 2014-05-21 10:03:05 +08:00
Marina Glancy
deeaed4332 MDL-45320 block_html: behat tests 2014-05-20 20:43:37 +08:00
Marina Glancy
3ee51425c7 MDL-45320 behat: Step definitions for blocks 2014-05-20 20:43:36 +08:00
David Monllao
28c86221ac MDL-45294 behat: Updating block references to aria label value 
Also improving moodle selectors xpath expressions
readability.
 2014-05-20 20:43:36 +08:00
Sam Hemelryk
487e68b432 MDL-44711 block_navigation: fixed typo in behat tests 2014-05-20 23:39:29 +12:00
Damyon Wiese
4e8a350c35 Merge branch 'MDL-45618' of git://github.com/timhunt/moodle 2014-05-20 14:59:48 +08:00
Dan Poltawski
06a689b761 Merge branch '44711-28' of git://github.com/samhemelryk/moodle 2014-05-20 10:15:11 +08:00
Tim Hunt
5bcfd504df MDL-45618 Fix @since PHPdoc tags. 2014-05-19 17:03:04 +01:00
Marina Glancy
cca6e78d87 MDL-45371 behat: Tests for block glossary_random 2014-05-19 15:18:04 +08:00
Sam Hemelryk
817d39b8aa MDL-44711 navigation: better handling of course expansion exception 2014-05-19 08:41:14 +12:00
David Monllao
ee9f6db7a2 MDL-44620 behat: Automate MDLQA-7 
- MDLQA-7: By default, a new course contains a Latest
News block which displays a specific number of recent
discussions from the news forum
 2014-05-13 17:25:26 +07:00
Dan Poltawski
11a325c673 MDL-37838 block_courseoverview: fix pluaralisation logic 
Note that this kind of handling of plurals is extremely limited, see:

https://moodle.org/mod/forum/discuss.php?d=85897
http://search.cpan.org/~petdance/Locale-Maketext-1.12/lib/Locale/Maketext/TPJ13.pod

However, this is a simple fix to the existing logic
 2014-05-12 17:42:14 +08:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release 
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
 2014-05-09 02:12:28 +02:00
Frederic Massart
6f6345e327 MDL-45462 flickr: Requests are now done over HTTPS 2014-05-08 11:27:36 +08:00
Frederic Massart
b04bf988ef MDL-43877 blocks: Files from blocks in my/ were accessible to the world 2014-05-07 14:27:11 +08:00
Marina Glancy
447d55d55a MDL-45429 block_glossary_random: check capability before suggesting to edit 2014-05-06 16:06:29 +08:00