moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76812 commits 37 branches 540 tags 1.3 GiB
Commit graph

76812 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Mudrák
32fc1a69a5 MDL-50310 glossary: Fix restore of random glossary entry block 
When restoring the random glossary entry block, we need to check that
the associated glossary has also been included in the backup and is
being restored. If not, we must invalidate the block configuration.

Before this patch, the block configuration was not invalidated.

Additionally, as a result of MDL-20131, the block configuration also
contains the course id of the associated glossary (which by the way does
not seem to be a wise choice, but I may be missing something). So we
need to remap this course id as well to avoid mismatch.
 2016-02-05 00:08:39 +01:00
David Monllao
9d5d9c64ff weekly release 3.1dev 2016-02-04 14:30:03 +08:00
David Monllao
e8074790d9 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-02-04 14:30:00 +08:00
AMOS bot
37f0cb879e Automatically generated installer lang files 2016-02-04 00:04:08 +08:00
Dan Poltawski
96c69429e5 Merge branch 'wip-MDL-52715-master-additional' of git://github.com/abgreeve/moodle 2016-02-03 09:44:27 +00:00
David Monllao
6d18da567d Merge branch 'MDL-52899' of git://github.com/timhunt/moodle 2016-02-03 13:44:41 +08:00
Adrian Greeve
a2161d57a4 MDL-52715 lib: Clean up of comments and variable names. 2016-02-03 10:07:08 +08:00
David Monllao
52ad3afadb Merge branch 'wip-MDL-51283-master' of git://github.com/marinaglancy/moodle 2016-02-02 17:40:39 +08:00
Marina Glancy
4be9c7ad99 MDL-51283 core_tag: Allow each tag area to set 'showstandard' 2016-02-02 17:31:17 +08:00
Marina Glancy
e11d7380c2 MDL-51283 core_tag: change tagtype to isstandard 
Change 'official' to 'standard' in UI
 2016-02-02 17:31:14 +08:00
Dan Poltawski
037d9918e1 Merge branch 'wip-mdl-42395' of https://github.com/rajeshtaneja/moodle 2016-02-02 08:18:06 +00:00
Rajesh Taneja
97eee5baac MDL-42395 mod_assign: Single feedback is always visible 
Single feedback is always visible, so no need to click to expand
 2016-02-02 16:06:45 +08:00
David Monllao
0612d476ef Merge branch 'MDL-49817-master' of git://github.com/danpoltawski/moodle 2016-02-02 13:57:43 +08:00
David Monllao
367cf39985 Merge branch 'MDL-52873-master-modgradeid' of git://github.com/mudrd8mz/moodle 2016-02-02 12:12:03 +08:00
David Monllao
51f322023f Merge branch 'MDL-52137-master' of git://github.com/andrewnicols/moodle 2016-02-02 10:55:59 +08:00
Dan Poltawski
3bb9f374e7 Merge branch 'MDL-42395_master' of git://github.com/markn86/moodle 2016-02-01 11:17:02 +00:00
Dan Poltawski
89881711da MDL-45740 choice: version bump 2016-02-01 11:09:42 +00:00
Dan Poltawski
98e01bb70e Merge branch 'MDL-45740_master' of git://github.com/markn86/moodle 2016-02-01 11:02:22 +00:00
Mark Nelson
da82688689 MDL-45740 mod_choice: fixed remaining issues 2016-02-01 18:49:22 +08:00
Dan Poltawski
b0e7075214 Merge branch 'wip-mdl-52932-m' of https://github.com/rajeshtaneja/moodle 2016-02-01 10:27:28 +00:00
Dan Poltawski
c89a009c56 Merge branch 'MDL-52940_master' of git://github.com/markn86/moodle 2016-02-01 09:49:20 +00:00
David Monllao
6b7421003b Merge branch 'MDL-51704-master' of git://github.com/dpalou/moodle 2016-02-01 17:19:59 +08:00
David Monllao
d23bf21b0a MDL-52715 js: Merge M.str and clean memory 2016-02-01 14:29:09 +08:00
David Monllao
0b39d21ae7 MDL-52715 ws: Fragments WS using fragment requires properly. 2016-02-01 14:29:09 +08:00
Adrian Greeve
cc73ea075e MDL-52715 lib: Addition of new requirements class. 
This adds a fragment requirements class to allow plugins
to register JavaScript to be used in an mform.
 2016-02-01 14:29:09 +08:00
David Monllao
1dea567d6e Merge branch 'MDL-52261_master_file_not_found' of git://github.com/BenKelada/moodle 2016-02-01 13:55:57 +08:00
David Monllao
cd55c6e249 Merge branch 'MDL-52913_master' of git://github.com/marxjohnson/moodle 2016-02-01 13:46:18 +08:00
Mark Nelson
d14ba3a2f4 MDL-52940 core_backup: prevent always displaying logs 2016-02-01 12:43:53 +08:00
David Monllao
b831527ce8 Merge branch 'MDL-52831-master-emptynames' of git://github.com/mudrd8mz/moodle 2016-02-01 11:28:40 +08:00
Mark Johnson
a2497e5036 MDL-52913 behat: Abort database transactions on exception. 2016-01-29 11:54:56 +00:00
Mark Nelson
635166b8c8 MDL-42395 mod_assign: build YUI module and fixed lint errors 2016-01-29 17:56:11 +08:00
Rushikesh
4f491bf70b MDL-42395 mod_assign: Showing the most recent feedback 2016-01-29 17:56:05 +08:00
David Monllao
c9d91bb734 weekly release 3.1dev 2016-01-29 14:36:50 +08:00
David Monllao
1789c20796 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-01-29 14:36:47 +08:00
Stephen Bourget
e62f6a01e4 MDL-45740 choice: add new events 2016-01-29 13:23:15 +08:00
David Monllao
ed654d4aa8 MDL-35590 block_navigation: Set attribute on node creation 
Otherwise we would need to unescape href and title.
 2016-01-29 13:01:26 +08:00
Rajesh Taneja
5e48383330 MDL-52932 behat: Restart session if it fails because of some reason 2016-01-29 11:59:01 +08:00
John Okely
a057ba5924 MDL-35590 navigation: Remove link from admin node if you have javascript 
Also:
* In behat, ensure nav node exists before checking attribute (Credit to
  Rajesh Taneja)
* Remove some unused JS constants
* Fix debugging notice for users without settings block
 2016-01-29 11:28:08 +08:00
David Monllao
846cd414bf MDL-46553 admin: Version bump after history rewrite 2016-01-29 10:22:12 +08:00
Eloy Lafuente (stronk7)
fabe7ebd53 MDL-50620 mod_scorm: Preventive (on rewrite) version bump to current. 2016-01-29 10:15:28 +08:00
David Monllao
4bed1fcc7e Merge branch 'MDL-35590-fixes' of git://github.com/ryanwyllie/moodle 2016-01-29 10:15:27 +08:00
Andrew Nicols
ca29dd4e84 Merge branch 'MDL-52825_master-fix' of git://github.com/dmonllao/moodle 2016-01-29 10:15:26 +08:00
Ryan Wyllie
5697de1832 MDL-35590 block_navigation: fix keyboard nav 
Fixed up the left/right keyboard navigation to match
the aria specification. Also stopped the root node from
being collapsible.
 2016-01-29 10:15:26 +08:00
David Monllao
90902953a8 MDL-52825 atto: Listen to gesturemovestart to discard some events 2016-01-29 10:15:26 +08:00
Andrew Nicols
17cd73b684 Merge branch 'MDL-52826_master-fix' of git://github.com/dmonllao/moodle 2016-01-29 10:15:25 +08:00
Rajesh Taneja
80f37f2739 MDL-35590 behat: Data-loaded is on li node 2016-01-29 10:15:25 +08:00
David Monllao
3e51b0ad7e MDL-52826 forms: Using id attr 
Switch from custom id references to the element's id attribute.

Extra fix to get rid of an unnecessary call to getValidationScript().
 2016-01-29 10:15:25 +08:00
Eloy Lafuente (stronk7)
3c415f13b8 Merge branch 'MDL-29817' of https://github.com/rushi963/moodle 2016-01-29 10:15:24 +08:00
Eloy Lafuente (stronk7)
6e38f41d8e MDL-52567 Core: amend existing test to new counting rules 2016-01-29 10:15:24 +08:00
Eloy Lafuente (stronk7)
bc269f6782 Merge branch 'MDL-52567_master' of https://github.com/nadavkav/moodle 2016-01-29 10:15:23 +08:00