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

* changes:
  Bug #1765276: Fixed default theme navbar
  Bug #1765276: Removed unused variables, other small changes
  Bug #1765276: Default theme variables mostly. Changed panels to cards, other small changes

* changes:
  Bug #1765276: Started working on default theme
  Bug #1765276: Fixed a couple of small things from last rebase
  Bug #1765276: Changed theme colors to variables

* changes:
  Bug #1765276: Updating the datepicker to bootstrap 4 version Includes changes to the library, see README.Mahara
  Bug 1765276: Finished working through styleguide, pagination, js errors

* changes:
  Bug 1765276: Lots of changes, mostly to fix problems found when looking through the styleguide
  Bug 1765276: Mostly working on the tabs page - otherr small changes

* changes:
  Bug 1765276: Minor fixes to match master as much as possible
  Bug 1765276: Fixed reports graph and missing line in php file that gave an error on the styleguide

* changes:
  Bug 1765276: Fixed nav tabs in file browser and artefact chooser
  Bug 1765276: Changes mostly on the user search page, minor change to nav and user page

* changes:
  Bug 1765276: Cleaned variables file and changed file layout slightly. Minor fixes
  Bug 1765276: Changed outstanding panels to cards

* changes:
  Bug 1765276: Started variable changes
  Bug 1765276: Minor changes

* changes:
  Bug 1765276: Fixing everthing after rebasing with master
  Bug 1765276: Changed breakpoints of panels, changed some more card-headings, color fixes