Skip to content
GitLab
Switch branch/tag
  1. 21 Mar, 2020 1 commit
  3. 20 Mar, 2020 4 commits
  5. 18 Mar, 2020 3 commits
  7. 17 Mar, 2020 2 commits
  9. 16 Mar, 2020 1 commit
  11. 15 Mar, 2020 4 commits
  13. 14 Mar, 2020 4 commits
    • Robert Lyon's avatar
      Merge changes from topic 'WR326669' · 997863d7
      Robert Lyon authored 
      * changes:
  Bug 1857935 Share dropdown styling
  Bug 1857935: Behat Tests
  Bug 1857935: Display people from own  institution(s) first when searching for them during portfolio sharing
      997863d7
    • Rebecca Blundell's avatar
      Bug 1845228: Make Mahara work with mysql 8.0.17 · e48f88ce
      Rebecca Blundell authored and Robert Lyon's avatar Robert Lyon committed 
      -Add mysql reserved words 'array' and 'member'
-Remove deprecated ||, &&, ! and replace with OR, AND, NOT
Note: Use of || is deprecated unless the PIPES_AS_CONCAT SQL mode is
enabled. In that case, || signifies the SQL-standard string
concatenation operator
-Quote uses of member in SQL queries
Note: when passed in as a variable it is quoted on query construction

behatnotneeded

Change-Id: I860bac5c44dab206b70a78215a5784e6f1fe3928
      e48f88ce
    • Cecilia Vela Gurovic's avatar
      Bug 1866942: set default value for groupsideblocklabels when creating a user · 22ba31db
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed 
      - when creating a user manually
- when creating a user by csv

behatnotneeded

Change-Id: I8266689b22ce17cf118043529a52dee7bb1fada9
      22ba31db
    • Cecilia Vela Gurovic's avatar
      Behat: downgrade composer packages · 95c82b79
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed 
      there are new versions of a few packages and composer
will try to upgrade them before running behat tests.

But these new versions don't work together very well,
so we ned to revert to the previous versions.

To see this changes here is the link to the first
behat run that broke in jenkins
https://test.mahara.org/job/mahara-gerrit/10891/console

this is what was installed by composer
Package operations: 0 installs, 5 updates, 0 removals
  - Updating symfony/css-selector (v3.4.38 => v5.0.5): Downloading (100%)
  - Updating behat/mink (v1.7.1 => v1.8.1): Downloading (100%)
  - Updating behat/mink-selenium2-driver (v1.3.1 => v1.4.0): Downloading (100%)
  - Updating fabpot/goutte (v3.2.3 => v3.3.0): Downloading (100%)
  - Updating behat/mink-browserkit-driver (1.3.3 => v1.3.4): Downloading (100%)

Note: If it still doesn't work for you in local machine,
remove the content of the behat folder on the mahara dataroot directory

behatnotneeded

Change-Id: Ibd48275c297a44527d551692bee1e4c4294d302b
      95c82b79
  15. 12 Mar, 2020 1 commit
  17. 09 Mar, 2020 1 commit
  19. 08 Mar, 2020 1 commit
  21. 06 Mar, 2020 3 commits
    • Evonne Cheung's avatar
      Bug 1857935 Share dropdown styling · 8622f190
      Evonne Cheung authored and Robert Lyon's avatar Robert Lyon committed 
      Fix now forces the dropdown box to be wider to fit in the longest
unwrapped line, and has margin on left to align all text away from
usericon, and a margin on right to stop horizontal scroll. The name
is regular weight, and the rest of the info are in a lighter weight.
- added in stylings for text for secondary information (email etc...)

behatnotneeded

Change-Id: I852b4f9364e8932064029d44652dd191c38926cf
      8622f190
    • Lisa Seeto's avatar
      Bug 1857935: Behat Tests · 043aead9
      Lisa Seeto authored and Robert Lyon's avatar Robert Lyon committed 
      

- add new step definition select_from_nested_search_box
- alter tests to call new step
- alter target of user name to display name

Change-Id: I3d53594a42feae2922ee7297a78efdb5e9bff04b
Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      043aead9
    • Lisa Seeto's avatar
      Bug 1857935: Display people from own · 75a96408
      Lisa Seeto authored and Robert Lyon's avatar Robert Lyon committed 
      
 institution(s) first when searching for them during portfolio sharing

- added in check when searching users to display users in institutions first
- added in select2js datasource formating to get user dropdown categories
- limit the type of data returned in ajax calls to limit data risks (Bug 1863043)
- refactor json and tpl
- refactor sql, show institution display name

Change-Id: I478a4d9534bf1de820ca59d60ca7768685e36a96
Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      75a96408
  23. 05 Mar, 2020 1 commit
  25. 04 Mar, 2020 1 commit
  27. 03 Mar, 2020 8 commits
  29. 02 Mar, 2020 5 commits