mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 21:20:02 +01:00
Code Issues Projects Releases Wiki Activity
68,305 Commits 36 Branches 527 Tags
Commit Graph

68305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marina Glancy
1de6c62dc7 Merge branch 'wip-MDL-45483-master' of https://github.com/kwiliarty/moodle 2014-05-19 12:37:10 +08:00
Damyon Wiese
b3eea60ecb Merge branch 'MDL-45533-27' of git://github.com/FMCorz/moodle 2014-05-19 12:25:56 +08:00
Damyon Wiese
634c982104 Merge branch 'MDL-44634-master' of https://github.com/dbezborodovrp/moodle 2014-05-19 12:08:24 +08:00
Sam Hemelryk
da4887a2d9 Merge branch 'MDL-45561-master' of git://github.com/jethac/moodle 2014-05-19 13:37:12 +12:00
Jetha Chan
1e0b920cba MDL-45561 themes: horizontal scroll in RTL base 2014-05-15 15:50:26 +08:00
Damyon Wiese
a929fd50f9 weekly on-sync release 2.8dev 2014-05-15 15:29:23 +08:00
Damyon Wiese
ccce0d49e2 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-05-15 15:29:20 +08:00
Damyon Wiese
2ffff04be7 MDL-41383 Filepicker: whitespace fix 2014-05-15 13:32:13 +08:00
Jetha Chan
05bb4d1320 MDL-41383: RTL fix for base when zoomed out 2014-05-15 13:28:26 +08:00
Frederic Massart
9389ff572b MDL-45533 editor_atto: Default paragraph is removed from empty Atto 2014-05-15 11:10:54 +08:00
Damien Bezborodov
5d49b2b21d MDL-44634 Regression: link to user profile in comments block fails due to double URI encoding 2014-05-15 11:39:24 +09:30
Damien Bezborodov
a9af43be51 MDL-44634 Regression: link to user profile in comments block fails due to double URI encoding 2014-05-15 10:48:50 +09:30
Marina Glancy
363c49f4c8 Merge branch 'MDL-36670' of git://github.com/jleyva/moodle 2014-05-14 16:34:52 +08:00
Damyon Wiese
9bced5c0e2 Merge branch 'MDL-41383-master-basefix' of https://github.com/jethac/moodle 2014-05-14 15:04:20 +08:00
Jetha Chan
92061d3890 MDL-41383 theme: filepicker zoom resiliency (base) 
Fixed an issue that broke the file picker on base when initial zoom level is less than 100%.
 2014-05-14 14:46:20 +08:00
Juan Leyva
a4496bdde9 MDL-36670 logging: action parameter length restricted to 40 chars 2014-05-13 16:05:39 +02:00
Damyon Wiese
4c77165ed6 Merge branch 'MDL-41383-27' of git://github.com/jethac/moodle 2014-05-13 16:00:10 +08:00
Eric Merrill
81d48fb907 MDL-45523 quiz Cleanup duplicate question instances. 2014-05-13 14:47:12 +08:00
Eric Merrill
6794a98f6c MDL-45522 quiz Check that sumgrade is valid before saving. 2014-05-13 14:35:43 +08:00
Jetha Chan
b993411de1 MDL-41383 theme: filepicker zoom resiliency 
Fixed an issue that broke the file picker on bootstrapbase when zooming in and out.
 2014-05-12 17:16:58 +08:00
Damyon Wiese
281e37eb0e Merge branch 'MDL-45502' of git://github.com/stronk7/moodle 2014-05-12 17:00:08 +08:00
Marina Glancy
912a0fd050 Merge branch 'wip-mdl-45514' of git://github.com/rajeshtaneja/moodle 2014-05-12 16:24:31 +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 v2.7.0 2014-05-10 18:35:21 +02:00
AMOS bot
e99836a306 Automatically generated installer lang files 2014-05-10 00:46:32 +00: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.
v2.7.0-rc2 		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
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