Skip to content
GitLab
Switch branch/tag
  1. 20 Oct, 2014 5 commits
  3. 19 Oct, 2014 1 commit
  5. 18 Oct, 2014 1 commit
  7. 17 Oct, 2014 1 commit
  9. 16 Oct, 2014 7 commits
    • Robert Lyon's avatar
      Merge "Add separate function for right nav menu" · ca2891ef
      Robert Lyon authored
      ca2891ef
    • Tobias Zeuch's avatar
      Add separate function for right nav menu · 2fd431ba
      Tobias Zeuch authored and Robert Lyon's avatar Robert Lyon committed 
      

Bug 1372536: Add a separate function to PluginArtefact, PluginInteraction and
PluginModule that lets you add menu entries especially to the right nav menu,
including top level entries.

The method right_nav in web.php still includes elements from the old menu_items
function for backwards compatibility but ignores all top level entries.

Change-Id: I91ba01f060a73575c483aa81aeb9201b11f1261f
Signed-off-by: default avatarTobias Zeuch <tobias.zeuch@kit.edu>
Signed-off-by: Aaron Wells's avatarAaron Wells <aaronw@catalyst.net.nz>
      2fd431ba
    • Son Nguyen's avatar
      Merge "Adjusting places where form error message's container appears escaped" · 4e38850f
      Son Nguyen authored
      4e38850f
    • Robert Lyon's avatar
      Finding the dimensions of hidden textareas (Bug #1382159) · 700340fe
      Robert Lyon authored 
      

If the parents of a textarea are also hidden it returns height/width
as 0, which is no use to us. So we need to find it's height/width when
not hidden.

So added some code to:
- to clone the textarea
- make it positioned way outside the viewport
- append it to body
- find height/width
- remove the clone from body
- return the height/width

Change-Id: Ib2fa2d80b3046909ed2763545410d5d95f464b4d
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      700340fe
    • Aaron Wells's avatar
      Restore "toggle" button to TinyMCEs with "tinymceconfig" param · 886a7463
      Aaron Wells authored and Robert Lyon's avatar Robert Lyon committed 
      Bug 1381738. All the TinyMCE instances that use the "maharaimage" plugin are providing
their own tinymceconfig param which redefines the whole list of plugins in use. So they
didn't get the message when "tooltoggle" became one of the standard plugins.

This fix is a bit of a hack. A more robust fix would provide a way for a TinyMCE to
*add* to the list of plugins, or just specifically say it wants to use maharaimage
instead of image.

Change-Id: Ia8128e5d70bd4be1e5d4b45efae368a88174c4c5
      886a7463
    • Aaron Wells's avatar
      Make Collection::save() play well with existing collections & non-null columns · 1f779bdd
      Aaron Wells authored 
      Bug 1381811: Collection::save() would create a new (empty) collection by
passing 0 as the id to the Collection constructor, even if the supplied
$data included an "id" field. Since the id was not supplied to the
constructor, it does not pull the collection's current data from the
database.

It would then call Collection->commit(), which would notice the "id"
field and do an update instead of an insert into the database. But due to
the way the Collection class is written, it would try to populate every
field of the collection table, rather than just those supplied in $data.

This means that all the database fields not supplied in $data, would
attempt to be filled with NULL. This threw an error because of the new
collection.submittedstatus NOT-NULL column.

Change-Id: I6a2927892459bd25d51bd58de1bd3e3584df0793
      1f779bdd
    • Robert Lyon's avatar
      Unlock root group homepage template to allow for editing (Bug #1369315) · f36fbc1c
      Robert Lyon authored 
      Due to the line 1868 in lib/db/upgrade.php
commit 1e4f1c55



All group homepages were locked including the one owned by root user.
That was fine before as one couldn't edit the root user's template
but now you can so we need to let this view be unlocked.

Only an issue if upgrading from version before 1.5.0

Change-Id: I02c28c0300ad9d640171c5870fa8630b0793e473
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      f36fbc1c
  11. 15 Oct, 2014 7 commits
  13. 14 Oct, 2014 7 commits
  15. 13 Oct, 2014 8 commits
  17. 12 Oct, 2014 3 commits