83360 Commits

Author SHA1 Message Date
Dan Poltawski
a6c34f3298 Merge branch 'MDL-57510-master' of git://github.com/ankitagarwal/moodle 2017-03-27 09:41:27 +01:00
Ankit Agarwal
0fa21eb715 MDL-57510 questionbank: Add horizontal navigation 2017-03-24 19:07:15 +05:30
Eloy Lafuente (stronk7)
216ea39be7 weekly release 3.3dev 2017-03-23 20:30:35 +01:00
Eloy Lafuente (stronk7)
0f9b7d3409 NOBUG: Fixed SVG browser compatibility 2017-03-23 20:30:33 +01:00
Eloy Lafuente (stronk7)
89d1ddc9a8 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-03-23 20:30:32 +01:00
David Monllao
7e448ee5b4 Merge branch 'MDL-57724-master' of git://github.com/jleyva/moodle 2017-03-23 12:47:19 +01:00
Juan Leyva
f3d9512d34 MDL-57724 mod_lesson: Init progress completed by default 2017-03-23 11:47:39 +01:00
Andrew Nicols
3d85d1685d Merge branch 'MDL-57429-master-fix' of https://github.com/snake/moodle 2017-03-23 11:51:50 +08:00
Andrew Nicols
85ead19b34 Merge branch 'MDL-40759-master-fix3' of http://github.com/damyon/moodle 2017-03-23 11:33:11 +08:00
Damyon Wiese
fe4f35b29b MDL-40759 fontawesome: Style fix for clean theme
Action menu items were misaligned because of change from smallicon to icon.
2017-03-23 11:30:48 +08:00
Jake Dallimore
29631e628f MDL-57429 badges: handle curl problems nicely during connection creation
- Properly validate the displayer API response before sending the
verification email.
- Properly validate the displayer API response before creating the
saved connection.
2017-03-23 11:27:15 +08:00
Damyon Wiese
2375f37c5a MDL-40759 fontawesome: Behat fix
Lang string fix.
2017-03-23 10:57:34 +08:00
Damyon Wiese
6586ad36ed MDL-40759 fontawesome: Fix section highlighting
The section highlighting code was re-written in parallel to font-awesome - so we need
to apply the same font-awesome tweaks here now.
2017-03-23 10:50:48 +08:00
David Monllao
b7cc51ca60 Merge branch 'MDL-57724-master' of git://github.com/jleyva/moodle 2017-03-22 21:20:03 +01:00
Juan Leyva
5f3351d747 MDL-57724 mod_lesson: New Web Service mod_lesson_finish_attempt 2017-03-22 17:24:24 +01:00
Juan Leyva
dfcabd3b33 MDL-57724 mod_lesson: Move EOL code to lib methods 2017-03-22 17:23:49 +01:00
David Mudrák
b4ef04e754 MDL-40759 icons: Fix the core_renderer::spacer() parameters 2017-03-22 13:44:20 +00:00
David Monllao
ee82b48efc MDL-57696 lesson: Replace old var reference by self 2017-03-22 13:13:06 +01:00
David Monllao
33c5f9fd63 Merge branch 'MDL-57696-master' of git://github.com/jleyva/moodle 2017-03-22 13:01:03 +01:00
Juan Leyva
e1f88fe7c4 MDL-57696 mod_lesson: New WS mod_lesson_process_page 2017-03-22 10:54:12 +01:00
David Monllao
2800c3f43d Merge branch 'MDL-57688-master' of git://github.com/jleyva/moodle 2017-03-22 10:16:54 +01:00
Eloy Lafuente (stronk7)
81f6163928 Merge branch 'MDL-40759-master-fix2' of http://github.com/damyon/moodle 2017-03-22 10:15:43 +01:00
Juan Leyva
269eb6c810 MDL-57688 mod_lesson: Fix parameter type for pageid and review 2017-03-22 10:09:39 +01:00
Dan Poltawski
d959810fcf Merge branch 'wip-MDL-34859-fix' of https://github.com/marinaglancy/moodle 2017-03-22 08:52:57 +00:00
Damyon Wiese
2a096103ac MDL-40759 comments: Update behat test
Don't call the deprecated lang string.
2017-03-22 11:35:13 +08:00
Marina Glancy
cc401e6f30 MDL-34859 forms: fix the checkbox in defaultcustom element 2017-03-22 11:25:58 +08:00
Jun Pataleta
745f79dad4 MDL-57994 course: Fix newsitems setting for course formats without news 2017-03-22 09:26:13 +08:00
David Monllao
7f0ddd40fb Merge branch 'MDL-57693-master' of git://github.com/jleyva/moodle 2017-03-21 21:18:11 +01:00
David Monllao
5b95bd50df Merge branch 'MDL-57688-master' of git://github.com/jleyva/moodle 2017-03-21 19:59:00 +01:00
Juan Leyva
8d6748380c MDL-57696 mod_lesson: Remove redirects from API
In this commit I removed redirects that potentially could break the Web
Services layer.
Instead doing redirect inside APIs I return a special flag that is
properly checked.
2017-03-21 15:51:51 +01:00
Juan Leyva
61b51764b8 MDL-57696 mod_lesson: Move code to lesson methods
Small refactor to avoid duplication in the Web Service
2017-03-21 15:51:50 +01:00
Juan Leyva
ef8d1c9a15 MDL-57693 mod_lesson: New WS mod_lesson_get_page_data 2017-03-21 15:48:18 +01:00
Juan Leyva
66cd7b8ecc MDL-57693 mod_lesson: Refactor to move code to lesson methods
This is a big refactor to avoid code duplication in the new WS.
Basically I’ve moved code from the page and renderer to the lesson
class.
New code is into methods, there are no code functionality changes (just
minor fixes in comments).
2017-03-21 15:48:17 +01:00
Juan Leyva
d088632b97 MDL-57688 mod_lesson: New WS mod_lesson_launch_attempt 2017-03-21 15:43:24 +01:00
Juan Leyva
dbba944e32 MDL-57688 mod_lesson: Move duplicated code to methods
Some code that will be used by Web Services was moved, we created new
methods to avoid code duplication:
- To generate the lesson messages on page view
- To check the time restrictions in a current attempt
2017-03-21 15:18:44 +01:00
Juan Leyva
ac9f0a6800 MDL-58229 mod_feedback: New WS get_unfinished_responses 2017-03-21 13:21:32 +01:00
Juan Leyva
82b2cd7d19 MDL-57820 mod_feedback: New WS mod_feedback_get_analysis 2017-03-21 13:12:35 +01:00
Juan Leyva
ac122465e0 MDL-57820 mod_feedback: Create function to get analysis for external api 2017-03-21 13:12:22 +01:00
Dan Poltawski
e3aced3b59 MDL-57162 tool_mobile: add a bit more phpdoc info 2017-03-21 12:07:54 +00:00
Dan Poltawski
0c5eee372b Merge branch 'MDL-57162-master' of git://github.com/jleyva/moodle 2017-03-21 11:38:06 +00:00
Dan Poltawski
5fd24a89a6 Merge branch 'MDL-56324-master' of https://github.com/lucisgit/moodle 2017-03-21 11:28:13 +00:00
Juan Leyva
82a7a67869 MDL-57818 mod_feedback: New WS mod_feedback_process_page 2017-03-21 12:25:32 +01:00
Juan Leyva
96ae31bddc MDL-57818 mod_feedback: Refactor form processing 2017-03-21 12:24:41 +01:00
Juan Leyva
74975948e5 MDL-57817 mod_feedback: New WS mod_feedback_get_page_items 2017-03-21 11:33:55 +01:00
Juan Leyva
951ddedf6f MDL-57816 mod_feedback: New WS mod_feedback_launch_feedback 2017-03-21 11:22:13 +01:00
David Monllao
a2ccbae441 Merge branch 'MDL-57685_master' of git://github.com/dmonllao/moodle 2017-03-21 10:54:44 +01:00
Juan Leyva
f4d0909fc0 MDL-57685 mod_lesson: New Web Service mod_lesson_get_pages 2017-03-21 10:53:35 +01:00
Eloy Lafuente (stronk7)
4d505af519 Merge branch 'MDL-55267-master-deprecation' of https://github.com/marcusgreen/moodle 2017-03-21 10:18:56 +01:00
Juan Leyva
e8eb889326 MDL-57162 tool_mobile: Native app banners for Android 2017-03-21 10:07:21 +01:00
Dan Poltawski
dca0ea03b1 Merge branch 'MDL-58317-master' of git://github.com/damyon/moodle 2017-03-21 08:03:42 +00:00