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
64422 commits 37 branches 544 tags 1.3 GiB
Commit graph

64422 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Nelson
bb74cdfef3 MDL-41792 block_calendar_upcoming: tidy existing code 2013-10-04 12:35:57 +08:00
Mark Nelson
ec126f624e MDL-41792 block_calendar_month: tidy existing code 2013-10-04 12:35:57 +08:00
Jerome Mouneyrac
f6a4357e19 MDL-41229 Filepicker: ie9 css - the picker content were displayed outside the picker 2013-10-04 11:01:04 +08:00
Sam Hemelryk
56cc9b387e weekly release 2.6dev 2013-10-04 15:43:58 +13:00
Sam Hemelryk
cf8943779e NOBUG: Fixed file access permissions 2013-10-04 15:43:58 +13:00
Sam Hemelryk
9b70e68445 NOBUG: Fixed SVG browser compatibility 2013-10-04 15:43:53 +13:00
Sam Hemelryk
577fc805a2 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-10-04 15:43:52 +13:00
Dan Poltawski
6cebf2bd60 MDL-42143 editpdf: Convert gspath to proper setting 
This will ensure we get better validation/feedback of the path.
 2013-10-04 10:14:18 +08:00
Marina Glancy
25b2b0ec13 MDL-42141 Change wrong spacing from MDL-41725 2013-10-04 12:03:03 +10:00
Adam Olley
c447c03538 MDL-38655: mod_assign: Use correct ordering on cap checks for submission downloads 2013-10-04 09:27:32 +09:30
Sam Hemelryk
7f62e4040a Merge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle 2013-10-04 08:25:58 +13:00
Eric Merrill
300eee6a45 MDL-9873 question Require question text 
This commit removes the code that requires the question text
for the multianswer question type, as it is a duplicate, and
throws errors.
 2013-10-03 08:50:39 -04:00
Peter Bulmer
f4491c2ade MDL-23692 forgotpw: Move redirection logic to fn. 
Moving to a function because the same logic will be needed in a new
place in later commits.
 2013-10-03 23:12:28 +13:00
Peter Bulmer
4f3f6524e8 MDL-23692 forgotpw: Improve failure notices. 2013-10-03 23:12:22 +13:00
Peter Bulmer
f888862eb0 MDL-23692 forgotpw: Comments & layout changes. 
No functional change.
 2013-10-03 23:12:13 +13:00
Peter Bulmer
a56e73b4a2 MDL-23692 forgotpw: Remove redundant code. 2013-10-03 23:12:04 +13:00
Peter Bulmer
f1fc0d3219 MDL-23692 forgotpw: Move functionality to lib. 
Move the password reset request handling into a function.
Move the password reset confirmation handling into a function.
 2013-10-03 22:21:41 +13:00
Marina Glancy
1b87f31348 Merge branch 'MDL-40829_mc' of https://github.com/rwijaya/moodle 2013-10-03 18:10:31 +10:00
rwijaya
983c46a8a7 MDL-40829 frontpage course heading: add padding to coursename and fix info ajax 2013-10-03 15:47:47 +08:00
Ankit Agarwal
7f151274ad MDL-40046 events: Replace add to logs in mod page with events 2013-10-03 15:00:54 +08:00
Damyon Wiese
9f5193a4b8 MDL-42023 Assign: Edit PDF plugin - fix unit tests 2013-10-03 14:05:28 +08:00
Adam Olley
e7dbb03978 MDL-42122 block_community: Dont show install option without capability 2013-10-03 14:25:06 +09:30
Frederic Massart
97376662df MDL-41230 tool_uploadcourse: Prevent max_execution_time issues 2013-10-03 11:44:54 +08:00
Frederic Massart
7bfc9edd9d MDL-41347 tool_uploadcourse: Invalid restore value handled 2013-10-03 11:22:53 +08:00
Marina Glancy
32e375bdcb Merge branch 'MDL-42023-master' of git://github.com/damyon/moodle 2013-10-03 13:08:03 +10:00
Sam Hemelryk
322ca2fc66 Merge branch 'MDL-41241-master-fix3' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2013-10-03 16:03:22 +13:00
Jason Fowler
dc48715eb7 MDL-40770 TinyMCE - Restoring border to colour selectors 2013-10-03 15:59:17 +13:00
Damyon Wiese
8c11cd2e09 MDL-41241 Atto: Restrict searching for anchor tags to selection. 2013-10-03 10:54:10 +08:00
Adrian Greeve
4d83abd052 MDL-42089 - Administration: Update to sql to include alternate name fields. 2013-10-03 10:34:07 +08:00
Rajesh Taneja
b650fe6a8e MDL-41744 Users: Convert key to value in bulk upload 
Menu profile field expects value, during bulk upload if value is passed by form
then options key is passed. So converting key to value if passed though form
 2013-10-03 10:16:31 +08:00
Sam Hemelryk
18a56136e7 Revert "MDL-33569 themes: Labels create extra margin below content." 
This reverts commits:
* 336c57575b.
* c528917d3f.
 2013-10-03 14:41:18 +13:00
Damyon Wiese
5c3864723a MDL-42023 assign: Edit PDF plugin - Damyon's contributions 2013-10-03 09:30:32 +08:00
Barbara Ramiro
95dfde5549 MDL-42023 assign: Edit PDF plugin - Barbara's contributions 2013-10-03 09:29:54 +08:00
Jerome Mouneyrac
e0cc92c650 MDL-42023 assign: Edit PDF plugin - Jerome's contributions 2013-10-03 09:29:54 +08:00
Davo Smith
1ce2ce7cb0 MDL-42023 assign: Add Edit PDF plugin to core. 
This plugin is heavily based on the uploadpdf plugin from
Davo Smith <git@davosmith.co.uk>. This is a fantastic plugin
that provides a great benefit for teachers marking assignments.

A big thankyou to Davo for writing the plugin and helping us to
get it integrated to core.

The plugin provides a pdf editing interface in the teachers browser
that lets them add comments and annotations to a students assignment
submission. The comment and annotations are then added to a pdf version
of the students submission which is send back to the student so they can
download it, or read it online.

This plugin has been primarily worked on by Damyon Wiese, Jerome Mouneyrac
and Barbara Ramiro. We have also had great feedback and suggestions from others
including the entire frontend team, Martin and Frederic Massart.
 2013-10-03 09:29:54 +08:00
Sam Hemelryk
c7387be83b Merge branch 'MDL-16464' of https://github.com/timhunt/moodle 2013-10-03 08:34:39 +13:00
Tim Hunt
dba40d4e70 MDL-16464 qtype_multichoice: fix missed question -> questionid. 2013-10-02 10:16:22 +01:00
Adrian Greeve
e5d53a1c2f MDL-40844 - Activity completion: Update of the sql to include additional name fields. 
The activity completion report wasn't showing the additional name fields.
 2013-10-02 16:29:17 +08:00
Marina Glancy
d794391d8b Merge branch 'MDL-41241-master-fix2' of github.com:damyon/moodle 2013-10-02 17:27:03 +10:00
Damyon Wiese
30509335dd MDL-41241 Atto: Make searching for the anchor tag more reliable 2013-10-02 15:21:11 +08:00
Marina Glancy
3b06d7b22b Merge branch 'MDL-42021-master-int' of git://github.com/FMCorz/moodle 2013-10-02 17:01:12 +10:00
Marina Glancy
0880a52c9a Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle 2013-10-02 16:54:59 +10:00
Damyon Wiese
766c6401b7 MDL-41912 Atto: Min-height fix - div was too small by default. 2013-10-02 13:13:35 +08:00
Frederic Massart
26422a66ad MDL-40050 webservice: Moving new events test file to right location 2013-10-02 13:10:45 +08:00
Frederic Massart
ee2df1a8b2 MDL-40050 webservice: Remove token from events 2013-10-02 13:00:28 +08:00
Damyon Wiese
3d27180e94 MDL-40493 User preference: Allow users to set their preferred text editor. 
This changes the setting htmleditor in the user table from a 0 or 1 column
to a user preference for the name of their preferred html editor.
 2013-10-02 12:49:30 +08:00
Frederic Massart
4fb6600eae MDL-42021 enrol: Missing objectid in enrolment_deleted event 2013-10-02 10:45:28 +08:00
Eric Merrill
46691973b3 MDL-25176 forum Redirects for new discussions shouldn't use SESSION 
Unset the session->fromdiscussion var, because we know that the correct
path will be computed later.
 2013-10-01 21:17:57 -04:00
Marina Glancy
a929e5e83d Merge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle 2013-10-02 09:20:52 +10:00
Sam Hemelryk
0fcedc7c73 MDL-41039 mod_quiz: version bump 2013-10-02 12:10:43 +13:00