Commit graph

12403 commits

Author SHA1 Message Date
Jerome Mouneyrac
f2806b9a65 MDL-27399 Add all the new mobile ws functions to the built-in mobile service 2011-06-09 15:19:58 +08:00
Jerome Mouneyrac
565e477184 MDL-27781 remove Undefined property: stdClass:: during installation with cli script 2011-06-09 15:08:03 +08:00
Sam Hemelryk
32a510de4e MDL-26105 block setting, improvement, replace switch-case with get_core_subsystems + get_plugin_types 2011-06-09 13:51:14 +08:00
Dongsheng Cai
b1627a92e5 MDL-26105 Block settings should contains less options, and be more user friendly
AMOS BEGIN
    MOV [page-blog-index, pagetype], [page-blog-index, blog]
    MOV [page-blog-x, pagetype], [page-blog-x, blog]
    MOV [page-tag-x, pagetype], [page-tag-x, tag]
    MOV [page-course-view-weeks, pagetype], [page-course-view-weeks, format_weeks]
    MOV [page-course-view-weeks-x, pagetype], [page-course-view-weeks-x, format_weeks]
    MOV [page-course-view-topics, pagetype], [page-course-view-topics, format_topics]
    MOV [page-course-view-topics-x, pagetype], [page-course-view-topics-x, format_topics]
AMOS END
2011-06-09 13:51:14 +08:00
Eloy Lafuente (stronk7)
2cb791ebc5 Merge branch 'wip-mdl-27577-master' of git://github.com/rajeshtaneja/moodle 2011-06-09 00:59:11 +02:00
Sam Hemelryk
00a33dcbac Merged branch 'MDL-26777-wip' of git://github.com/mouneyrac/moodle.git 2011-06-08 17:52:59 +08:00
Sam Hemelryk
96e0194c05 Merged branch 'MLD-27551' of git://github.com/mouneyrac/moodle.git with changes 2011-06-08 17:34:17 +08:00
Sam Hemelryk
0b8dea80dc Merge branch 'MDL-27747' of git://github.com/timhunt/moodle 2011-06-08 17:09:05 +08:00
Sam Hemelryk
f6bd0b9e39 Merged branch 'MDL-27695' of git://github.com/nebgor/moodle.git with changes 2011-06-08 16:25:57 +08:00
Jerome Mouneyrac
b4c74367a3 MDL-26774 fix web service function moodle_user_get_users_by_id. It now matches viewing profile / editing profile. It suppose to work for current user / other user / admin. It is not returning the information of course profile. 2011-06-08 16:07:12 +08:00
Jerome Mouneyrac
c1b658832d MDL-27551 add enable mobile feature (enable web services + mobile service - add mobile builtin service - add unique shortname for service) 2011-06-08 15:10:26 +08:00
Sam Hemelryk
287d1c0c2c Merged branch 'MDL-25775_head' of git://github.com/grabs/moodle.git 2011-06-08 13:49:36 +08:00
Aparup Banerjee
3b6711d5ce MDL-27695 Documentation : updated the moodle docs link at the footer of pages to point to new docs url 2011-06-08 13:44:35 +08:00
Aparup Banerjee
ca7d5f8bbc MDL-27500 HTML Editor - updating tinymce version used by moodle to 3.4.2 2011-06-08 11:19:26 +08:00
Aparup Banerjee
abd7557e79 MDL-27500 HTML Editor - added build 3.4.2 of tinymce 2011-06-08 11:16:37 +08:00
Sam Hemelryk
9186cb7e98 Merged branch 'ou-messaging-release' of git://git.luns.net.uk/moodle with conflict resolution for MDL-27171 2011-06-08 11:07:22 +08:00
Sam Hemelryk
7bff5441c8 Merged changes for MDL-25394 2011-06-08 10:58:42 +08:00
Sam Hemelryk
0373264c20 Merge branch 'MLD-27565-wip' of 'git://github.com/mouneyrac/moodle.git' with changes and conflict resolution for MDL-27565 2011-06-08 10:11:51 +08:00
Sam Hemelryk
78736e5d64 Merged branch 'MDL-27566-wip' of git://github.com/mouneyrac/moodle.git with changes and conflict resolution for MDL-27566 2011-06-08 10:02:59 +08:00
Sam Hemelryk
da1bf0e82a MDL-27721 Fixed up typo in upgrade comments 2011-06-08 09:49:43 +08:00
Tim Hunt
af2f98ee39 MDL-27747 Imporove API for getting the standard fraction choices.
This includes moving the None option to the top, which is slightly better for usability.
2011-06-07 13:53:29 +01:00
Eloy Lafuente (stronk7)
2b64de2008 MDL-27721 ratings - drop interim 'unknown' defaults 2011-06-07 12:58:59 +02:00
Jerome Mouneyrac
8d46dabb6e MDL-27565 implement moodle_notes_create_note 2011-06-07 17:28:51 +08:00
Jerome Mouneyrac
a623b6b892 MDL-27566-wip implement moodle_message_send_messages function (matching front end logic - TODO: 2 core functions to change to support bulk operations) 2011-06-07 16:40:55 +08:00
Jerome Mouneyrac
0bf486a619 MDL-26777 moodle_webservice_mobile_get_siteinfo TODO: add this service name into the service of MDL-27551 2011-06-07 15:19:53 +08:00
Tim Hunt
70d248181c MDL-20636 remove QTYPE from some comments. 2011-06-06 17:48:29 +01:00
Eloy Lafuente (stronk7)
cdda538128 MDL-20636 changes to core & questions DB layer 2011-06-06 17:16:28 +01:00
Eloy Lafuente (stronk7)
1db15c2718 MDL-20636 changes to core & questions upgrade code
Changes include:

    - fixing versions and requires to current weekly (2011060313)
    - fix essay wrong upgrade step. Review & test!
    - fix numerical missing savepoint.
2011-06-06 17:16:11 +01:00
Andreas Grabs
a9e9549911 MDL-25775 - Site policy page blank 2011-06-06 18:15:12 +02:00
Tim Hunt
54771d89d1 Merge remote-tracking branch 'moodle/master' into MDL-20636_master_new_question_engine
Conflicts:
	lib/db/upgrade.php
	mod/quiz/lib.php
2011-06-06 17:14:59 +01:00
Tim Hunt
0370e3ab0d MDL-27736 html2text add unit test for Eloy's new code. 2011-06-06 16:54:13 +01:00
Eloy Lafuente (stronk7)
3709ecb929 MDL-27736 improve a bit html2text to avoid some ugly & unnecessary trailing spaces 2011-06-06 16:42:55 +01:00
Eloy Lafuente (stronk7)
4561302dec MDL-20636 Prepare stuff for cleaner merging 2011-06-06 16:38:23 +01:00
Rajesh Taneja
6a0bf5c4b0 MDL-27577 moodlelib - fixed dst offset in userdate, usergetdate and make_timestamp functions 2011-06-03 09:50:38 +08:00
Ruslan Kabalin
8e26531519 MDL-27171 messages: add processor uninstall function
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-06-02 09:27:05 +01:00
Ruslan Kabalin
d004c4b20a MDL-27171 messages: fix bug in upgrade_populate_default_messaging_prefs
isset check assumed that $defaultpreferences is the object

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-06-01 12:30:28 +01:00
Ruslan Kabalin
afed8d0f17 MDL-27652 messages: introduce message_update_processors
This function populates default message preferences for all existing providers
when the new message processor is added.

The change also includes update of message_set_default_message_preference to
make possible using it for particular message processor update.

install_populate_default_messaging_prefs() is no longer needed and depricted.

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-06-01 12:02:37 +01:00
Ruslan Kabalin
67147c2550 MDL-27171 messages: populate messaging defaults after the installation
This makes the order of plugins returned by get_plugin_types not important as
all messaging defaults population is done at the end.

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-05-31 16:00:32 +01:00
Ruslan Kabalin
a4de1d8f0e MDL-27171 messages: remove excessive include_once
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-05-31 14:02:37 +01:00
Ruslan Kabalin
298925d4d1 MDL-27171 messages: clean up pereferences on message provider removal
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-05-31 10:55:30 +01:00
Ruslan Kabalin
31afb0a437 MDL-27171 messages: recover message_update_providers backward compatibility
'return true' was removed by mistake

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-05-31 10:05:39 +01:00
Ruslan Kabalin
e8fc7940a8 MDL-27171 messages: $defaultpreferences is an object, use isset instead.
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-05-31 09:46:22 +01:00
Dan Poltawski
b46ca3d7ae messaging: MDL-27171 - change variable with underscores 2011-05-31 09:07:38 +01:00
Sam Hemelryk
e5824bb9c6 MDL-25394 Tidied up several things in order to get this integrated 2011-05-31 14:28:03 +08:00
Anthony Forth
37959dd471 MDL-25394 Improved support for mobile and device themes 2011-05-31 14:25:52 +08:00
Eloy Lafuente (stronk7)
a6b2f0faf2 Merge branch 'MDL-25191-master' of git://github.com/sammarshallou/moodle 2011-05-31 00:58:34 +02:00
Sam Hemelryk
52a3c2c703 Merge branch 'wip-mdl-27603-master' of git://github.com/rajeshtaneja/moodle 2011-05-30 17:21:29 +08:00
Rajesh Taneja
6006774cf7 MDL-27603 enrol_user - changed modifier to modifierid which is used in database 2011-05-30 10:10:03 +08:00
Sam Hemelryk
5436561c7c Merge branch 'MDL-27600-master' of git://github.com/sammarshallou/moodle 2011-05-30 10:05:59 +08:00
Adam Olley
9b01f68597 MDL-27009: Fix role group by statement for statistics 2011-05-30 09:05:53 +08:00