- 22 Aug, 2011 4 commits
-
-
Eugene Venter authored
Bug #809058 If the site is running https, embed external videos and google apps over https where possible. Change-Id: Id1d4b66c1f04587d4864126c2e58d2167e45fe70 Signed-off-by:
Eugene Venter <eugene@catalyst.net.nz>
-
Francois Marier authored
-
Piers Harding authored
Move attribute checking to create/update phase of auth/saml as missing first/last/email is not actually an error unless auto-create, or update is active. Change-Id: If249b40c2d3d231f13ac784943e0c6dcbde43cb0 Signed-off-by:
Piers Harding <piers@catalyst.net.nz>
-
Francois Marier authored
-
- 21 Aug, 2011 5 commits
-
-
Richard Mansfield authored
The html artefact must be installed before the textbox content is upgraded to use html artefacts. Moving the upgrade from the internal artefact into the blocktype will make it happen in the correct order. Change-Id: I56da7296f39f3a1807ba9b71867ce69fec5cc186 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
Change-Id: I0921e3b22a4cd7ef5e8052f2d89d8a6e5b953b93 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Hugh Davenport authored
-
Hugh Davenport authored
-
Hugh Davenport authored
-
- 19 Aug, 2011 4 commits
-
-
Richard Mansfield authored
Merge changes I4428db94,I2ad65571,Icc6de3bb,Iaea3dc3b,I1b492bc3,I55638eda,I7242d47b,Icc3b669d,Ic68f21bb,I98b410a3,I37ee9d80,I321735de,Ib2492fb9,I9520f1d3,I81f6b322 * changes: Add comments on html artefacts (bug #736665) Add an artefactchooser to the textbox config form (bug #736665) Fix artefactchooser pagination in chrome after search (bug #803707) Add 'selectjscallback' option to artefactchooser Add 'getblocks' option to artefactchooser Add option for artefactchooser to return a list of artefacts Add user feedback for exceptions in instance_config_save Let blocktype plugins specify inline configuration javascript Allow block configration to submit a list of other blocks to redraw Add a page to manage html notes (bug #736665) Convert textbox config during Leap2a import/export Save textbox content to the artefact table (bug #736665) Allow access to block instance when saving block configuration Move textbox blocktype into the internal artefact plugin (bug #736665) Add html artefact type to internal artefact plugin (bug #736665)
-
Francois Marier authored
-
Hugh Davenport authored
If a file is in the groups area that doesn't have member access then the group member that initially uploaded it can't view it This patch allows the author (uploader) of a file to still have access no matter what the access is set to for the group role they belong to Bug #812673 Change-Id: I1d5bbccb41d34af15617ac5abc673b1265ac9f3e Signed-off-by:
Hugh Davenport <hugh@catalyst.net.nz>
-
Francois Marier authored
-
- 18 Aug, 2011 1 commit
-
-
Francois Marier authored
-
- 17 Aug, 2011 3 commits
-
-
Hugh Davenport authored
-
Richard Mansfield authored
-
Richard Mansfield authored
-
- 16 Aug, 2011 7 commits
-
-
Hugh Davenport authored
-
Hugh Davenport authored
-
Evonne Cheung authored
Change-Id: Ie48b79e048fd34f2c167eac5ab3b9310e1e747e8 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Hugh Davenport authored
* changes: Update existing file quotas when changing the default (bug #821169) Preserve admin/system user fields when committing LiveUser instance
-
Richard Mansfield authored
Adds an additional checkbox to the default quota settings for users, groups, and institution members, which will apply the default quota to existing users/groups. Change-Id: I811bfc9902c4adb62615ea8364473174d714ddb1 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
The $USER object is saved to the usr table in the db whenever it changes, and also periodically when the lastaccess property is updated. However, for some fields, it's not appropriate to overwrite the db value with the $USER property, because these fields are generally only modifiable by an admin (e.g. quota, suspended) or the system (e.g. active). Previously we have tried to deal with this by removing the sessions of users whose properties are modified by an admin. This is okay when suspending or deleting a user, because the user should be forced to log out anyway. But for other properties like the user file quota, it shouldn't be necessary to force the user to log out because the value was modified by an admin. It makes more sense to specify a list of fields (including quota) that should be reloaded into $USER on every commit. Change-Id: Id0268a29be976a506b09d81aeb6a5b80a26e72fa Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Hugh Davenport authored
Change-Id: Ie2f748214146d86caf53a82a167ea2d86e8a4fb6 Signed-off-by:
Hugh Davenport <hugh@catalyst.net.nz>
-
- 15 Aug, 2011 16 commits
-
-
Richard Mansfield authored
-
Stacey Walker authored
Change-Id: I8f0c4793c629875d36eb28e33a8dadd665cb4957 Signed-off-by:
Stacey Walker <stacey@catalyst-eu.net>
-
Ruslan Kabalin authored
-
Richard Mansfield authored
Let the owner enable comments at the artefact level. If a textbox contains an artefact which allows comments, add a comments link at the bottom of the block to the artefact page where users can view and leave comments. Change-Id: I4428db947cbee987d5ce55f8062ce4b7c30b0239 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
The configuration form's tinymce field allows the user to edit the currently selected html artefact. A new link below the content field displays an artefactchooser which, allows the user to select from their existing html artefacts. On selecting an artefact, the tinymce contents are replaced with the contents of the selected artefact. Also displays a message to the user whenever there are other blocks containing the same artefact as the one they've selected. Change-Id: I2ad655714429252ed3877e6589c37c6bbcaad37e Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
In the artefactchooser (e.g. when configuring a blogpost block), the pagination is not updated in after a search when using chrome (a js error occurs when trying to remove an element which is not in the page). Change-Id: Icc6de3bb4cf92b907fa10ef5ea03c839c15be083 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
This allows users of the artefactchooser to specify a js callback to be run whenever a new artefact radio button is selected. The callback will be passed all properties of the selected artefact that were requested when calling View::build_artefactchooser_data. Change-Id: Iaea3dc3b9c4f8be434d601670dc7611316f86443 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
When searching through the artefactchooser, and the configuration option to return artefacts is enabled, this option also returns the ids of all the blocks containing each artefact being returned. Change-Id: I1b492bc389a66b1a57a0080391ea370f4988e1fa Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
Ajax requests to the artefactchooser pieform element provide html for selecting artefacts, but no direct access to properties of the artefacts they return. This adds a configuration item to the artefactchooser called 'returnfields', which specifies a list of artefact properties that should be returned along with the html. Change-Id: I55638eda503a6395aa7ffeb9c20299d290631a03 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
If an exception is thrown in a blocktype plugin's instance_config_save function, display an error on screen rather than dying silently with the 'loading...' box still visible. Change-Id: I7242d47b53a279714e8d4fc3502518eefd207f73 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
A blocktype plugin's get_instance_config_javascript method is expected to return an array of urls to javascript files. With this change, if the method returns a string rather than an array, it will be added to the configuration form as inline javascript. Change-Id: Icc3b669d2d3358c64c5abd3ed5c965f296a6d113 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
When a block is saved after configuration, the view editor currently only rerenders the newly configured block. This change allows a blocktype's instance_config_save function to return a list of other blocks on the page that should be rerendered in addition to the newly configured block. This will provide a mechanism for *all* the textbox blocks on a page which contain a particular html artefact to be updated when the text of one of those blocks is updated (see bug #736665). Change-Id: Ic68f21bb8f46b79c5d9ed8e32504314dcc067429 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
Textbox blocks can now create and edit html artefacts, but they will never be able to provide an interface to delete them. Because fragments of html will become reusable in several blocks, there will inevitably be some fragments that disappear from views, but still exist in the artefact table. A My Notes area is added under the Content menu to manage these fragments. Change-Id: I98b410a35109f9945211329671089e45f917f38d Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
For compatibility with previous versions of Mahara, do the appropriate textbox conversion during Leap2a import and export. On import, create artefacts for any textbox with its content stored directly in the block configuration. On export, save the text from the artefact inside the block. Change-Id: I37ee9d808893ca7cd084eb3ea2623ada87cb6558 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
When a text box block is saved, a new html artefact is created, or an existing html artefact updated. The 'Block content' field from the form is saved into the description field of the artefact, and the artefact title is overwritten with the block title. This patch includes an upgrade to convert the contents of all existing textboxes on the site to html artefacts. Change-Id: I321735de5c0e4dc5768222f02c8e7e1bc716c237 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
This allows the blocktype plugin's instance_config_store function to access the block instance object. Change-Id: Ib2492fb9847096abab5d25032db6f7656ff47833 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-