- 29 Jun, 2012 5 commits
-
-
Hugh Davenport authored
Change-Id: Ie0d96d6caa5b6aff66bdb49e14940ab349046147 Signed-off-by:
Hugh Davenport <hugh@catalyst.net.nz>
-
Hugh Davenport authored
- Also adds various submenus for admin home - register - statistics - home This means that these pages can see where they are Change-Id: I81faade62ac140a3c68503c13aadbfe36c646911 Signed-off-by:
Hugh Davenport <hugh@catalyst.net.nz>
-
Hugh Davenport authored
- Number of logged in users in last week Change-Id: Ibaf27bef18fdabf984d2d157c8c53cbb6e5c626a Signed-off-by:
Hugh Davenport <hugh@catalyst.net.nz>
-
Hugh Davenport authored
Gets the following per institution - no of institution members - no of views owned by the institution or its members and broken down into the 3 view types which already appear in site registration data (profile, portfolio, and dashboard) - no of block instances owned by the institution or its members and broken down by block type (~32 block types) - no of artefacts authored by institution members and broken down by artefact type (~53 artefact types) - no of forum posts authored by institution members Change-Id: I9f38f2f9179c365aa0c669013d98c67dcb7bc5bd Signed-off-by:
Hugh Davenport <hugh@catalyst.net.nz>
-
Hugh Davenport authored
Copied from the mahara.org registration table. It stores each registration field in a local database with a timestamp of when the data was obtained. This storage is done whether or not the data is actually sent to mahara.org. Change-Id: Ib8478b0caa97c5cc5f04a7d5b44f2a9ac11f9ce8 Signed-off-by:
Hugh Davenport <hugh@catalyst.net.nz>
-
- 28 Jun, 2012 5 commits
-
-
Richard Mansfield authored
-
Son Nguyen authored
Three blocktypes have been updated 1. Blog block (entire journal) -> add shortcut "New entry" to this blog 2. recentposts block (most recent journal entries): if there is only one journal -> add shortcut "New entry" if more than on -> display a dropdown list of blogs to select (these blogs are taken from the block configuration) 3. taggedposts block (tagged journal entries): all journals owned by this user will be displayed in the dropdown list *Note: Javascript code has been removed from the template. *Note: Call initialization js code of all blocks Change-Id: Ibdd63dfee39787f74d872a6a31b3286c63dee70a Signed-off-by:
Son Nguyen <son.nguyen@catalyst.net.nz>
-
Hugh Davenport authored
-
Richard Mansfield authored
-
Richard Mansfield authored
"Group Type:" is no longer an appropriate label to display in the group info block; instead the group options are just listed without a label, as they are on Find/My Groups. Request membership is added to the list when that option is set. Also, on Find/My Groups, the group description is put on a new line, below the list of options. Change-Id: I8bddccb42a7985fc8f2ed0700adb2dadd3c6eb88 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 27 Jun, 2012 13 commits
-
-
Hugh Davenport authored
-
Hugh Davenport authored
-
Hugh Davenport authored
* changes: Cut down on similar failed notification notifications (bug #1009301) Don't recursively notify admins about notification exceptions (bug #1009301)
-
Richard Mansfield authored
* changes: Add spans and classes to pieform element pre- and post-html Avoid cross-domain ajax requests from user subdomains (bug #1006634) Use subdomain URLs on Settings and Edit view pages (bug #1006634) Allow html to appear directly after an element in pieforms Allow login redirect to subdomains (bug #1006634) Add a function to get the servername from the request Always use wwwroot to generate the cookie domain (bug #1006634) Add clean URL "User subdomain" option (bug #1006634)
-
Richard Mansfield authored
* changes: Remove plans block javascript from template (bug #1002168) Use get_all_blocktype_javascript in 5 files:
-
Richard Mansfield authored
Merge changes Ib67a4adf,I2354cdcf,Iecf288d4,I961671d7,I02760d10,Idb307371,Ib705b8fc,Ic6bcfab3,If66abd5b,Ia46c3c52,I847aa583,Ide4f33ab,I7b2143ac,I14c6af22,I3841a74d * changes: Group collections and views in the submission drop-down (bug #786389) Add optgroups to pieform select element Use View::get_views_and_collections for submission lists (bug #786389) Filter by submitted views in View::get_views_and_collections Show submission information on collection index page (bug #786389) Disallow editing and deletion of submitted collections (bug #786389) Get the details of the entity a collection is submitted to Modify release form to release entire collections (bug #786389) Handle collection submissions in view/submit.php (bug #786389) Add a function to release a submitted collection (bug #786389) Allow required activity parameters to be specified as strings Separate db-specific parts from View::release Deal with collections in submission forms (bug #786389) Add submission properties to Collection class (bug #786389) Add submission fields to collection table (bug #786389)
-
Richard Mansfield authored
By putting more javascript into the static plansblock.js file, it's possible to remove the script element from the template. This is better for exports, which should not include javascript designed for the site. Putting the entire block initialisation into a separate function also allows the pagination links to be made available when a new plans block is first dragged into a page. Change-Id: I7a5e6448c14272660b317b55b4db7cd2829576f7 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Son Nguyen authored
view/blocks.php view/view.php user/view.php group/view.php index.php Change-Id: Ie1ba5cb82489756d419c5ace9f5d2d56eee3311d Signed-off-by:
Son Nguyen <son.nguyen@catalyst.net.nz>
-
Richard Mansfield authored
-
Richard Mansfield authored
In the submission drop-down on the group homepage, if the user has submittable views and submittable collections, they are grouped together in the drop-down so that views and collections are easily distinguished. Change-Id: Ib67a4adffa0ac8ebefb0f1305036e58f583e61d9 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
Currently, the pieform select element only generates html option elements. This allows options to be grouped into <optgroup>s. Change-Id: I2354cdcf687711519e307fa7551b3c27ccc342ab Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
In the group views block, use View::get_views_and_collections to get submission lists in which submitted views are grouped into collections. Also removes the old View::get_submitted_views function which is no longer necessary. Change-Id: Iecf288d4084db00bff9551f34abbb10215f87782 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
Modifies View::get_views_and_collections to take the id of a group, and then filters the list of views and collections to return only those which have been submitted to the group. Also modified to use extra_view_info to fetch the view and view owner urls. Change-Id: I961671d74dae2af7c38d0418f45d74fbd8c7336c Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
- 26 Jun, 2012 15 commits
-
-
Richard Mansfield authored
-
Christopher Tombleson authored
Change-Id: I6332832bf850cf870948b8ef0f73334023a442e8 Signed-off-by:
Christopher Tombleson <christopher@catalyst.net.nz>
-
Richard Mansfield authored
-
Simon Story authored
Display an error if a user tries to enable auto-creation at the same time as having registration enabled for an instition. Change-Id: I22cf0df27c5e4edc3d7f71e8870fe84620419279 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Hugh Davenport authored
-
Richard Mansfield authored
* changes: Add required db fields for 'resize images on upload' feature. Add language and help files for 'resize images on upload' feature. Add option to set default user setting for 'resize images on upload'. Display 'resize images on upload' option in filebrowser form element. Add 'resize images on upload' support to filebrowser pieform element. Add dedicated image resizer class. Resize Large Images On Upload
-
Mike Kelly authored
Update artefact.file version to force the database upgrade. Change-Id: I838acf82a7bbceb9e3d185b33bbf196cb9c5c0a9 Signed-off-by:
Mike Kelly <m.f.kelly@arts.ac.uk>
-
Mike Kelly authored
Change-Id: I4f7f9dde9a354fbf5466f029f886c5da285d2e0c Signed-off-by:
Mike Kelly <m.f.kelly@arts.ac.uk>
-
Mike Kelly authored
This is dependent on whether the user option is enabled in file config settings. The option controls whether the check box in the filebrowser form element to enable resizing images on upload is checked by default or not, on a per-user basis. Change-Id: Id49b75bc08280b63ff57d3e0515b8513b08f1395 Signed-off-by:
Mike Kelly <m.f.kelly@arts.ac.uk>
-
Mike Kelly authored
Only display if user option is enabled in file config options. Change-Id: Iaa19508f65701216e30435b34e9b262cb2393ab1 Signed-off-by:
Mike Kelly <m.f.kelly@arts.ac.uk>
-
Mike Kelly authored
Resize the uploaded image (overwrite temp file) if resize has been specified and the image exceeds the maximum size limit, using the imageresizer class. Inform the user if there isn't enough memory available to resize the image. Change-Id: I6576063802b6fe78f32b8f2274fd12e08380ea1c Signed-off-by:
Mike Kelly <m.f.kelly@arts.ac.uk>
-
Mike Kelly authored
Change-Id: I602869fabb3ff0a113af892fde183370434709bb Signed-off-by:
Mike Kelly <m.f.kelly@arts.ac.uk>
-
Mike Kelly authored
In filebrowser form elements, support a 'resize images on upload' option. Make some options in artefact.file get_config_options to: - switch on resizeonupload functionality - show the user the option to enable or disable it - set the max image height and width Max image height and width are prefilled with get_config(imagemaxheight) and get_config(imagemaxwidth). Display the option beneath the file upload element, if enabled (resizeonuploadenable), and user option is set to appear (resizeonuploaduseroption). Set check box according to user preference (resizeonuploaduserdefault). Extend save_uploaded_file function to check whether the uploaded image has been resized. If it has, reset the uploadmanager filesize value before committing the file. Change-Id: I8d64b4433f7d25f63b211b9e5ebc5c44d1bc23e7 Signed-off-by:
Mike Kelly <m.f.kelly@arts.ac.uk>
-
Richard Mansfield authored
Change-Id: Idf805a5ca7334306ee89f306337d9e884ee722e8 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Son Nguyen authored
This lang string will be used in other places. Change-Id: Ic0d0ddcc6fc0bdcdb90e532b1a1435c7a06c6394 Signed-off-by:
Son Nguyen <son.nguyen@catalyst.net.nz>
-
- 25 Jun, 2012 2 commits
-
-
Richard Mansfield authored
On a user's collections list, remove edit and delete buttons, and display an additional message for submitted collections. Change-Id: I02760d10b76da04d34b666056db7a68017f8a338 Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
This patch stops a user from accessing collection/edit.php, collection/views.php, and collection/delete.php when the collection is submitted. Change-Id: Idb3073711a00f617859ffcd02741d177a66ec4fe Signed-off-by:
Richard Mansfield <richard.mansfield@catalyst.net.nz>
-