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

69449 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damyon Wiese
281e37eb0e Merge branch 'MDL-45502' of git://github.com/stronk7/moodle 2014-05-12 17:00:08 +08:00
Frederic Massart
c32290337b MDL-44953 theme_more: Removing odd-looking text-shadow 2014-05-12 16:51:14 +08:00
Marina Glancy
912a0fd050 Merge branch 'wip-mdl-45514' of git://github.com/rajeshtaneja/moodle 2014-05-12 16:24:31 +08:00
Frederic Massart
4d2b346997 MDL-45130 editor_atto: Remove debugging messages for missing plugins 
This is no longer required as the toolbar configuration prevents
missing plugins from being set. However, even if we do not output
any notice, we ignore missing plugins to prevent errors in case
one was uninstalled but left in the editor toolbar.
 2014-05-12 16:08:14 +08:00
Frederic Massart
2c47e5005b MDL-45380 theme_bootstrapbase: Restore config override highlight 2014-05-12 15:42:17 +08:00
Andrew Nicols
72704adf03 MDL-44486 core: Rewrite JavaScript progressbar 2014-05-12 15:29:47 +08:00
Rajesh Taneja
20503d1572 MDL-45514 behat: Fixed should_not_exist timout param 2014-05-12 14:12:10 +08:00
AMOS bot
010114963b Automatically generated installer lang files 2014-05-12 00:39:42 +00:00
Eloy Lafuente (stronk7)
e443e016b2 MDL-45502 Bump release to 2.8 dev branch 2014-05-11 03:44:22 +02:00
AMOS bot
a7b1d935cf Automatically generated installer lang files 2014-05-11 00:47:33 +00:00
Eloy Lafuente (stronk7)
730d717183 weekly back-to-dev release 2.8dev 2014-05-11 00:16:23 +02:00
Eloy Lafuente (stronk7)
c1ed254643 Moodle release 2.7 2014-05-10 18:35:21 +02:00
AMOS bot
e99836a306 Automatically generated installer lang files 2014-05-10 00:46:32 +00:00
Michael Aherne
8bf91fb893 MDL-45496 core Added space to logged in as line 2014-05-09 16:30:05 +01:00
Kevin Wiliarty
7a98bbab51 MDL-45483 mod_forum: corrects values for maxattachments in forum settings 2014-05-09 00:52:42 -04:00
Damyon Wiese
8c80b452dc on-demand release 2.7rc2+ 2014-05-09 11:07:26 +08:00
Damyon Wiese
b69f3db458 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-05-09 11:07:10 +08:00
Marina Glancy
f094167bef MDL-45486 Bump all versions to planned release 2014-05-09 10:50:39 +08:00
Dan Poltawski
a5fd1a13c8 Merge branch 'MDL-45486' of git://github.com/stronk7/moodle 2014-05-09 10:50:26 +08:00
John Okely
6d90ef2b4a MDL-45296 mod_assign: Revert changes to lock_submission and unlock_submission events 2014-05-09 09:58:55 +08:00
AMOS bot
fe75ff290f Automatically generated installer lang files 2014-05-09 00:40:45 +00: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
Eloy Lafuente (stronk7)
2fe085b284 MDL-45296 tests: ensure all submissions exist 
The changes performed with the change from
create_from_user() to create_from_submission()
in practice enforce a new restriction about
submissions having to exist in order to fire
their lock/unlock events.

This did not exist before the change and, also,
it seems that the assign api itself, submission->lock() ...
also accepts non existing submissions.

So I was not 100% sure about how to fix these events:

1) enforcing submission to exist.
2) firing them only if the submission exist.

I've gone with 1) for now, making tests to pass. But will
raise the question in the Tracker, just in case we have
to move to the 2) approach for any reason.
 2014-05-08 20:03:34 +02:00
Eloy Lafuente (stronk7)
b95db263ca MDL-45296 tests: Fix unit tests to have objectid 
In order to create the needed subscriptions to
make the event tests reliable a subscriptions
generator has been added. It performs raw-sql
subscriptions because by using the forum API
events would be fired (and that's something
we don't want to happen).
 2014-05-08 20:03:17 +02:00
Eloy Lafuente (stronk7)
98b69989ff Moodle release 2.7rc2 2014-05-08 16:36:41 +02:00
Eloy Lafuente (stronk7)
b8f0ec297d Merge branch 'MDL-45296' of git://github.com/stronk7/moodle 2014-05-08 15:58:46 +02:00
Eloy Lafuente (stronk7)
b8ac973a21 MDL-45296 phpdoc: add some missing params 2014-05-08 15:52:07 +02:00
John Okely
9c94ca5843 MDL-45296 events: Fix objecttable and ids 
Various events had them incorrectly set or missing:
  - submission_locked
  - submission_unlocked
  - subscription_created
  - subscription_deleted
 2014-05-08 15:30:03 +02:00
Marina Glancy
585ff7eaec Merge branch 'MDL-45462-master' of git://github.com/FMCorz/moodle 2014-05-08 19:50:13 +08:00
sam marshall
4133822ea5 MDL-45478 Conditional availability: Custom user restriction missing 
There was an error in the JavaScript and custom user field
restrictions did not show correctly when editing the form.

Behat tests didn't cover custom user fields, so I added a
scenario.
 2014-05-08 11:57:57 +01:00
Eloy Lafuente (stronk7)
b8622d1632 Merge branch 'MDL-45443-master' of git://github.com/FMCorz/moodle 2014-05-08 12:52:54 +02:00
Eloy Lafuente (stronk7)
6280e88d69 Merge branch 'MDL-45444-master' of git://github.com/andrewnicols/moodle 2014-05-08 12:40:27 +02:00
Eloy Lafuente (stronk7)
a23a2ed19d Merge branch 'wip-mdl-44262' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	composer.json
 2014-05-08 12:00:33 +02:00
Rajesh Taneja
50a01e0fc5 MDL-44262 Behat: Bump behat version to get format fix 2014-05-08 17:46:50 +08:00
Frederic Massart
a36f8b36dd MDL-45443 theme_base: Missing closing bracket ruining the CSS 2014-05-08 17:37:37 +08:00
Eloy Lafuente (stronk7)
ab870c7e69 Merge branch 'wip-mdl-45461' of https://github.com/rajeshtaneja/moodle 2014-05-08 11:31:54 +02:00
Andrew Nicols
83e8f495f2 MDL-45472 AJAX: Whitelist prototype values form JS Error in exception dialogue 2014-05-08 16:44:11 +08:00
Marina Glancy
9a9b5257fa Merge branch 'MDL-45373-master' of git://github.com/jamiepratt/moodle 2014-05-08 15:41:20 +08:00
Frederic Massart
c5e8a036c5 MDL-45332 repository_url: URL parameter is using PARAM_URL 2014-05-08 15:35:03 +08:00
Andrew Nicols
079c3a9446 MDL-45444 editor_atto: Fix vertical alignment of editor buttons 2014-05-08 12:33:12 +08:00
Marina Glancy
317e98badd MDL-45414 wiki: blank image for page index icons 2014-05-08 12:12:50 +08:00
Marina Glancy
b76ae3b0ce Merge branch 'MDL-44630_CC_Changes' of git://github.com/moodlerooms/moodle 2014-05-08 12:05:20 +08:00
Marina Glancy
f69c0d572e Merge branch 'MDL-45398-master' of git://github.com/sammarshallou/moodle 2014-05-08 12:04:53 +08:00
Frederic Massart
6f6345e327 MDL-45462 flickr: Requests are now done over HTTPS 2014-05-08 11:27:36 +08:00
Dan Poltawski
d1a316373f Merge branch 'MDL-45425-master' of git://github.com/andrewnicols/moodle 2014-05-08 11:05:20 +08:00
Dan Poltawski
327c382c47 MDL-43312 tinymce: bump plugin version 2014-05-08 10:52:36 +08:00
Dan Poltawski
dac2e286da Merge branch 'MDL-43312-master' of git://github.com/damyon/moodle 2014-05-08 10:51:51 +08:00
Rajesh Taneja
8ad79f5c2e MDL-45461 behat: Added custom hack notice for chrome+safari+ie 2014-05-08 10:10:28 +08:00
Eloy Lafuente (stronk7)
9c1bbddce7 Merge branch '45457-27' of git://github.com/samhemelryk/moodle 2014-05-07 23:54:36 +02:00
Sam Hemelryk
1c17e19a5c MDL-45457 phpdoc: fixed up a couple of @package typos 2014-05-08 08:14:10 +12:00