Skip to content

GitLab

Switch branch/tag
  1. 19 Jun, 2018 2 commits
  3. 17 Jun, 2018 2 commits
  5. 15 Jun, 2018 1 commit
  7. 07 Jun, 2018 1 commit
  9. 05 Jun, 2018 1 commit
    • Robert Lyon's avatar
      Bug 1774334: Correcting redirect on login for site in subdirectory · d9ce7d92
      Robert Lyon authored 
      

The fix in Bug 1774309 fails to work correctly when the site
is in a subdirectory of the apache root.

To test:
1) Adjust your site's apache file and set the DocumentRoot to be
parent of htdocs
2) Change the 'wwwroot' db value for site to include the 'htdocs/' bit
3) Restart the apache server
4) Go to site, adding 'htdocs/' to url
5) Try logging in

before patch: end up not found page with url containing two 'htdocs/'

after patch: end up at correct place

behatnotneeded

Change-Id: Ic5e1de2c5edaf96bbdd9b2403f0f65e45a4b80c0
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      d9ce7d92
  11. 01 Jun, 2018 1 commit
    • Robert Lyon's avatar
      Bug 1774274: Added scenarios that incorporate checking popups · 1eb72aa4
      Robert Lyon authored 
      

To allow checking for a popup we need to stop the after_step hook
closing the popup before we check it.

To do this we need to add tag called @allow_popups to the feature file
so that popups stay open for the next step to check

To use with steps:
- And I should not see a popup
- And I accept the alert popup
- And I accept the confirm popup
- And I cancel the confirm popup
- And I should see "text" in popup

Change-Id: I5fa4827b12b355204141dd8b052bc4f5c77ae3a0
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      1eb72aa4
  13. 31 May, 2018 3 commits
    • Mark Webster's avatar
      Bug 1771362: Fix timezone issues. · bc25beec
      Mark Webster authored and Robert Lyon's avatar Robert Lyon committed 
      Adds timezone dropdown the site settings. If no timezone selected
it uses site settings country to determine correct timezone and sets
that in the database.
PHP and DB session timezones will then assume this setting for all times.

This makes setting $cfg->dbtimezone obsolete - there is a warning to
admins to update their timezone setting on admin dashboard.

Limitations:
- A timezone or country MUST be selected in site options.

- Will not correct existing incorrect times, as no timezone info was
stored in the DB for dates/times, so it's impossible to determine what timezone
was used when saving.

- Changing the timezone will not adjust the display of existing times, for the
same reason.

behatnotneeded

Change-Id: I34c64cd51ece6758e76dd8c37007dcb316005845
      bc25beec
    • Ghada El-Zoghbi's avatar
      Bug 1773864: Throw MaharaException with valid error number · 23287554
      Ghada El-Zoghbi authored and Robert Lyon's avatar Robert Lyon committed 
      Pass error number and message correctly to the
MaharaException call when coming back from the
externalfeed curl call.

Sponsored by Central Queensland University

behatnotneeded

Change-Id: I03a2b666bde3905d2466ffbe35f1b35ca8a088bf
      23287554
    • Robert Lyon's avatar
      Bug 1774309: Only redirect with QUERY_STRING when it exists · 1c3d039b
      Robert Lyon authored 
      

If trying to access a page requiring login the system remembers the
path (QUERY_STRING) you were trying to access when login is successful

But if you login from the homepage there can be no QUERY_STRING set

Noticed when doing behat tests

behatnotneeded

Change-Id: I38cf1f6df7432d70ced5fe5df84bd56b47f1f163
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      1c3d039b
  15. 29 May, 2018 2 commits
  17. 28 May, 2018 3 commits
    • Rebecca Blundell's avatar
      Bug 1765674: Make registration revokable and data always visible · 50a14e7a
      Rebecca Blundell authored and Robert Lyon's avatar Robert Lyon committed 
      - changed some lang strings to make them work whether registered or not.
- made Registration box always visible
- added functionality to remove registration
- removed option to change email setting. Registration means sending
  updates.
- added registration_firstsent field to use for telling the admin how
  long their site has been regiestered.
- removed switch for "Send weekly updates" from "Site options" page as
  it seemed confusing to have it in 2 places with different wording.
- updated failing behat tests

Change-Id: I47609df6a0ae34932e5c0d2d34a338fe08c7570a
      50a14e7a
    • Robert Lyon's avatar
      Bug 1771473: Confusion of sorting · 6853aed4
      Robert Lyon authored 
      

The baseurl for the pagination was not getting set correctly if 'all'
tags was joined with a special sort/filter.

behatnotneeded

Change-Id: Ic5ebcd4388b7808062a91ea463031e4c5ffa2083
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      6853aed4
    • Rebecca Blundell's avatar
      Bug 1772792: Update behat for php7.2 · 584c6aff
      Rebecca Blundell authored 
      - changed composer dependencies to make 7.2 work
- switched to carat syntax which allows upgrade up to anything below the next major version.
- fixed use of count to check for null in Behat2Renderer.php
- tested dependencies with php 5.6, 7.0, 7.1, 7.2. You do need to
  manually delete the composer.lock file and run make initcomposer to resolve issues.

behatnotneeded

Change-Id: I725d8ac6a2f8ca9d67c95d7d6184882a364c0762
      584c6aff
  19. 27 May, 2018 3 commits
  21. 24 May, 2018 2 commits
  23. 23 May, 2018 3 commits
  25. 22 May, 2018 3 commits
  27. 21 May, 2018 1 commit
  29. 20 May, 2018 1 commit
    • Robert Lyon's avatar
      Bug 1763163: record who has been given what page for one time copy · 1dcaef85
      Robert Lyon authored 
      

This changes the parent patch a bit. Instead of recording on the view
table if a page is able to be copied to existing group members we
insetad record in a new existing copy table if a group page/collection
has been copied to a member and if not make the copy.

We've also made the switch a slide switch, eg when switching it to
'Yes' it does the task on save and then switches back to 'No'.

This means at a later time if set to 'Yes' again it will do the copying
again and give any newer members a copy of all pages/collections as
well as give older members copies of any newer pages / collections /
collection pages since the previous switching to 'No'

Note: Currently adding new collection pages to older members will only
add the pages as singular pages to their portfolio.

behatnotneeded

Change-Id: Ia22d8138d80ec5fdb5a401de7289b256f9e5fc69
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      1dcaef85
  31. 19 May, 2018 1 commit
  33. 16 May, 2018 3 commits
  35. 15 May, 2018 3 commits
  37. 14 May, 2018 1 commit
  39. 12 May, 2018 1 commit
  41. 10 May, 2018 1 commit
    • Robert Lyon's avatar
      Bug 1770496: Validate access for member to a public group · 7d9d1b29
      Robert Lyon authored 
      

When site public pages are turned off.

If the user is a member of a group that has 'public' access and the
site 'Allow public pages' are turned off, the user should be able to
view the group's home page - therefore allowing them to paginate
through the "Group portfolios" block in the group home page.

behatnotneeded

Change-Id: I1ea49927532f967c8a676b8a1590d1db3787cfc2
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      7d9d1b29
  43. 09 May, 2018 1 commit