Commit graph

64149 commits

Author SHA1 Message Date
Marina Glancy
d55f05ef43 MDL-41181 function moveto_module does not modify properties of object
instead it returns the new value for module visibility
2013-08-27 15:36:40 +10:00
Damyon Wiese
f5a791ee7a Merge branch 'wip-MDL-41307-master' of git://github.com/abgreeve/moodle 2013-08-27 13:36:38 +08:00
Marina Glancy
955d91c698 MDL-41181 No need to reset modinfo cache after moveto_module()
it is already reset inside the function
2013-08-27 15:36:21 +10:00
Damyon Wiese
a6163e7a5f MDL-31093 Scorm course format: Remove behat tests
The scorm course format has been removed so we don't need to test it anymore.
2013-08-27 13:26:47 +08:00
Damyon Wiese
f6c2af867f Merge branch 'master_MDL-40122' of git://github.com/danmarsden/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-08-27 13:16:55 +08:00
Damyon Wiese
92058753ac Merge branch 'MDL-40877-master' of git://github.com/FMCorz/moodle 2013-08-27 12:46:23 +08:00
Damyon Wiese
7316f46a23 Merge branch 'MDL-40447_master' of https://github.com/nadavkav/moodle 2013-08-27 12:27:47 +08:00
Damyon Wiese
58e6ac1e9a Merge branch 'MDL-40752_master' of https://github.com/nadavkav/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-08-27 12:23:16 +08:00
Dan Poltawski
e820d50791 Merge branch 'MDL-37211_master' of https://github.com/nadavkav/moodle 2013-08-27 11:54:28 +08:00
Rajesh Taneja
ddf05b5e9d MDL-41415 Events: get_string should not use new 2013-08-27 11:36:26 +08:00
Rajesh Taneja
41566267c5 MDL-41415 Events: get_legacy_logdata is protected 2013-08-27 11:36:11 +08:00
Damyon Wiese
2e68b1254f MDL-39871 themes RTL: Get rtlblockmanipulations from any parent 2013-08-27 11:14:53 +08:00
Nadav Kavalerchik
5b2ed8b5ff MDL-39871 Blocks,Themes: Swap block regions in RTL mode (using pre-defined array) 2013-08-27 11:14:52 +08:00
Dan Poltawski
67c6ab1646 Merge branch 'wip-MDL-41222-master' of git://github.com/marinaglancy/moodle 2013-08-27 11:03:35 +08:00
Dan Poltawski
d1584b6165 Merge branch 'MDL-41098-master' of git://github.com/damyon/moodle 2013-08-27 10:57:09 +08:00
Dan Poltawski
02ebac0bf1 Merge branch 'wip-MDL-41419-master' of git://github.com/abgreeve/moodle 2013-08-27 10:55:51 +08:00
Damyon Wiese
4fd8adab75 MDL-41098 atto: Fix for dialogue ignoring centered option. 2013-08-27 10:40:31 +08:00
Damyon Wiese
08a95d50bb MDL-41098 atto: Force some styles on the editor
Bootstrap is overriding random styles on the contenteditable div like:
line-height, font-size and color. Silly - force them to be the same as the
textarea we are derived from.
2013-08-27 10:40:24 +08:00
Adrian Greeve
9c3bfea0da MDL-41419 - unit tests: Fixed up sporadic test failures in externallib_test.php.
Also added much needed comments to the unit test.
2013-08-27 10:40:08 +08:00
Frederic Massart
5d9b539ee2 MDL-41428 repository_coursefiles: Missing white space in name 2013-08-27 10:31:27 +08:00
Damyon Wiese
70512ebdfc MDL-40321 theme_bootstrapbase: Combine reset into existing overrides file 2013-08-27 10:17:23 +08:00
Damyon Wiese
37bb910633 Merge branch 'wip-MDL-40321_master' of git://github.com/gjb2048/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-08-27 10:07:07 +08:00
Damyon Wiese
c90641facb MDL-41098 Atto Text editor: Add new text editor to core
This is an alternative to the TinyMCE text editor that is based on HTML5
content editable regions.

It has been designed to "gel" with Moodle and uses YUI for javascript,
Moodle standard dialogs and standard moodle buttons. It has also been designed
to work well on mobile devices and can collapse down to a narrow column if required.

Imported from the plugins database here:
https://moodle.org/plugins/view.php?plugin=editor_contenteditable

Original git repository here:
https://github.com/damyon/contenteditable
2013-08-26 22:16:43 +08:00
Charles Fulton
9930e4267c MDL-41256 course: improved debugging on course creation 2013-08-26 06:59:33 -07:00
Dan Poltawski
51eba172e6 Merge branch 'MDL-41291-master' of git://github.com/mr-russ/moodle 2013-08-26 17:50:08 +08:00
Dan Poltawski
a0df83441b Merge branch 'MDL-38505' of git://github.com/jmvedrine/moodle 2013-08-26 17:47:05 +08:00
Damyon Wiese
650b464a16 MDL-41213 filepicker: Version bump for css changes 2013-08-26 16:18:37 +08:00
Damyon Wiese
9e179acfd3 Merge branch '41213-26' of git://github.com/samhemelryk/moodle 2013-08-26 16:00:35 +08:00
Marina Glancy
b469e62a77 MDL-41317 Set correct context to send bulk message page 2013-08-26 17:41:43 +10:00
Marina Glancy
0e1bd87cc8 MDL-41369 Set proper context and navigation path for user messages 2013-08-26 17:32:57 +10:00
Rajesh Taneja
54bc6d1955 MDL-41418 Administration: Page context should be set before setting page title 2013-08-26 15:22:12 +08:00
Dan Poltawski
aa8fe63937 Merge branch 'MDL-40055-master' of git://github.com/FMCorz/moodle 2013-08-26 15:09:33 +08:00
Frederic Massart
861b0510e5 MDL-39959: Replace Legacy events - Groups
This combines the following changes:

* Event for group member added
* Event for group member removed
* Event for group created
* Event for grouping created
* Event for group updated
* Event for grouping updated
* Event for group deleted
* Event for grouping deleted
* Adding tests for deleting functions
* Bulk remove of members uses low-level API

    The reason for this is that a bulk event has no value from a logging
    perspective as it is not granular. So now, the API is a bit slower,
    but the information the events contain makes sense, beside this is
    not (and should not be) used very often.

    The reason why the events_trigger_legacy() is kept is because we
    cannot create a new event for this, as we don't encourage developers
    to created bulk events, for the reasons mentioned above.

    I removed the call that gets the user record from the function
    groups_remove_member() as it was not required and only appeared
    to check if the user existed. It appears to be safe not to do
    this check as nothing would fail down the line.

* Bulk unassign of groupings uses low-level API

    As the previous commit, we keep the legacy event for now as it would
    be wrong to create a new event to replace it.

    Also, the code has been changed to call the low-level API to unassign
    groups from groupins, even though at the moment there are no
    events for that function.

* Bulk deletion of groups uses low-level API

    Again, we keep the legacy event because replacing it would force
    us to create a new event that does not make sense. See MDL-41312.

* Bulk deleting of groupings uses low-level API
* Asserting legacy event name in unit tests
* Minor SQL query and code improvements
2013-08-26 15:03:17 +08:00
Dan Poltawski
11b80a6044 Merge branch 'MDL-35930' of git://github.com/rwijaya/moodle 2013-08-26 14:55:54 +08:00
Dan Poltawski
8f9e51417e Merge branch '40249-26' of git://github.com/samhemelryk/moodle 2013-08-26 14:33:06 +08:00
Rossiani Wijaya
3f0d3a7ea0 MDL-35930 filepicker filemanaer: make announcement on page change when selecting view files options 2013-08-26 14:30:35 +08:00
Dan Poltawski
ba59a28305 Merge branch 'MDL-36126_master' of https://github.com/markn86/moodle 2013-08-26 14:25:20 +08:00
Frederic Massart
725dfe6a54 MDL-40055 mod_assign: Wrong namespace when throwing exception 2013-08-26 14:21:34 +08:00
Frederic Massart
959a328472 MDL-40055 mod_assign: Setting level according to new event constants 2013-08-26 14:17:18 +08:00
Frederic Massart
5e8eb969e0 MDL-40055 mod_assign: get_name() uses get_string() not lang_string 2013-08-26 14:17:18 +08:00
Frederic Massart
bd2e982998 MDL-40055 mod_assign: Replace add_to_log 'grade submission' 2013-08-26 14:17:18 +08:00
Frederic Massart
9a289c3da5 MDL-40055 mod_assign: Replace add_to_log 'unlock submission' 2013-08-26 14:17:18 +08:00
Frederic Massart
6332ff7a35 MDL-40055 mod_assign: Replace add_to_log 'submit' 2013-08-26 14:17:18 +08:00
Frederic Massart
b1e52860ea MDL-40055 mod_assign: Replace add_to_log 'submission statement accepted' 2013-08-26 14:17:18 +08:00
Frederic Massart
89fbc20263 MDL-40055 mod_assign: Replace add_to_log 'submissioncopied' 2013-08-26 14:17:18 +08:00
Frederic Massart
8bb213eb60 MDL-40055 mod_assign: Replace add_to_log 'set marking workflow state' 2013-08-26 14:17:18 +08:00
Frederic Massart
e59a85ba61 MDL-40055 mod_assign: Replace add_to_log 'set marking allocation' 2013-08-26 14:17:17 +08:00
Frederic Massart
159b7f4024 MDL-40055 mod_assign: Replace add_to_log 'revert submission to draft' 2013-08-26 14:17:17 +08:00
Frederic Massart
ad10ad1415 MDL-40055 mod_assign: Replace add_to_log 'reveal identities' 2013-08-26 14:17:17 +08:00
Frederic Massart
3d1331be34 MDL-40055 mod_assign: Replace add_to_log 'lock submission' 2013-08-26 14:17:17 +08:00