Cecilia Vela Gurovic authored Mar 06, 2019 and Robert Lyon committed Mar 16, 2019

- hide edit/delete buttons for versioned peer assessment block
- save the list of assessment in the block version

behatnotneeded

Change-Id: I33b7fe62db8ccbe39697aced8ce54328a77b87a7

Rebecca Blundell authored Feb 26, 2019 and Cecilia Vela Gurovic committed Mar 06, 2019

behatnotneeded

Change-Id: I334c936f6eb5e41a5c70ee69cc97206653b7e321

Change-Id: I7bc23d2c4a92aee184e5d5e43804490e058161ce

Steven Spinelli authored Feb 07, 2019 and Cecilia Vela Gurovic committed Mar 04, 2019

Change-Id: I7abce407ed2c57670256a748090821606a7b3784

Merge "Behat Bug 1804750 user self delete requires current password removed 2nd user from Background"

Merge "Bug 1810356 Behat: Online users side block functionality Added scenario to display only institution on members"

Steven Spinelli authored Jan 03, 2019 and Cecilia Vela Gurovic committed Mar 04, 2019

Added scenario to display only institution on members

Change-Id: If75ea5defdd4ef19827c003186121dbc5b6f0c14

Merge "Behat Bug 1804074 Adding journal entry from Journal block on page Merge branch 'master' of https://git.mahara.org/mahara/mahara"

Steven Spinelli authored Jan 08, 2019 and Cecilia Vela Gurovic committed Mar 04, 2019

Change-Id: I9412c757a78161dd6f198917efc9a9cea598a3e8

Steven Spinelli authored Oct 26, 2018 and Cecilia Vela Gurovic committed Mar 04, 2019

Change-Id: Ic6a67ee03ead5f7ad764f73ae077557162002eda
Signed-off-by: Steven Spinelli <stevens@catalyst.net.nz>

Steven Spinelli authored Nov 23, 2018 and Cecilia Vela Gurovic committed Mar 04, 2019

removed 2nd user from Background

Change-Id: I8cbb67b4a7b1401fd6ba553d4e3a67ecda220525

Steven Spinelli authored Nov 28, 2018 and Cecilia Vela Gurovic committed Mar 04, 2019

Change-Id: I9a26d46c53d55e1aaca7c0238676b066e65f029f

Steven Spinelli authored Dec 03, 2018 and Cecilia Vela Gurovic committed Mar 04, 2019

Change-Id: I72ed2ddf2e59495a03130ae810ed5a12064ef11f

Steven Spinelli authored Nov 20, 2018 and Cecilia Vela Gurovic committed Mar 04, 2019

Merge branch 'master' of https://git.mahara.org/mahara/mahara

* 'master' of https://git.mahara.org/mahara/mahara:
  Bug 1803616: SyntaxError: expected expression, got ';'
  Bug 1802180: Have a simplified group update webservice option
  Bug 1800422: Fixed z-index for custom-dropdown
  Bug 1803194: Need to include the user object
  Bug 1802205: All external links to be opened in new tab/window by default

Change-Id: Ibe0898d9326c0527cc6a4e937da9782b00c10eb0

Merge "Bug 1803908 User reports objectionable content on a page and admin responds added rerquested changes Change-Id: Id24655483df5edce5eb8202fd97aead246bf8cfc"

-replaced panels with cards
-added scroll steps for items displayed off the page
-@TODOs in add_tags.feature should be ignored for review
and fixed later.

Change-Id: I3a70448aba11fef4cab424c332606ea70e7ae736

* changes:
  Bug #1765276: Ocean theme changes
  Bug 1765276: Ffixed minor styleguide bug with inline styles
  Bug 1765276: Fixed up a couple of small bugs
  Bug #1765276: More navigation fixes for themes
  Bug #1765276: Changing btn-default to btn-secondary, btn-xs to btn-sm

* changes:
  Bug #1765276: Fixed navigation
  Bug #1765276: Removing some variables. Minor fixes to model
  Bug #1765276: changed more panels to cards and card-heading to card-headers. Lots of changes to cards, list-group-items, and buttons
  Bug #1765276: Progress bar and collection navigation of custom theme
  Bug #1765276: Fixing mobile navigation
  Bug #1765276: Changing card-block to card-secondary and getting rid of card-block in default and modern themes
  Bug #1765276: Fixing raw isues
  Bug #1765276: Fixing minor issues in the configurable theme

* changes:
  Bug #1765276: Changing card-block to card-secondary, and then getting rid of card-block in raw Fixing any issues caused by this
  Bug #1765276: Updating raw and primary school theme
  Bug 1765276: Cleaning up variables
  Bug #1765276: Updating the primary school theme

* changes:
  Bug #1765276: Fixed broken navigation caused by bootstrap js upgrade
  Bug #1765276: Fixed broken datepicker by changing the file needed
  Bug #1765276: Replaced final card-headings with card-header, started replacing lighten and darken with scale-color
  Bug #1765276: Updated bootstrap variables file in the raw theme to match the actual bootstrap variables file

* changes:
  Bug #1765276: Upgraded bootstrap to 4.2.1
  Bug #1765276: Minor fixes for list group padding
  Bug #1765276: Fixed all issues reported on https://bugs.launchpad.net/mahara/+bug/1765276
  Bug #1765276: Fixed behat tests, other small fixes

* changes:
  Bug #1765276: Finishing up modern theme
  Bug #1765276: A few raw theme fixes, mostly changing card-heading to card-header
  Bug #1765276: Fixed pagination on styleguide
  Bug #1765276: Working on modern theme. Sorted out variables Minor change to primary school and ocean theme Fixed gulp file

* changes:
  Bug #1765276: Update Modern variables to BS4
  Bug #1765276: Fixed the input order of variables in raw and default
  Bug #1765276: More Default theme changes

* changes:
  Bug #1765276: Added all the bootstrap variables back into the raw variables and added default flags
  Bug #1765276: Lots of changes to default, small changes to raw, including adding the default flag to the custom variables
  Bug #1765276: Small fixes on default theme