Code

Our Umbraco: High five feed#277

Code

Open

crgrieve wants to merge 80 commits intoumbraco:mainumbraco/OurUmbraco:mainfrom crgrieve:temp-high-fiveCopy head branch name to clipboard

+1,954-529

Commits

Commits on May 20, 2018

• Initial check-in of high five markup

  Show description for d9d78b3
  hartvig

  committed
  d9d78b3

  Copy full SHA for d9d78b3

• starting API and data work

  crgrieve

  committed
  5fd599c

  Copy full SHA for 5fd599c

• Add initial member search endpoint

  MMasey

  committed
  2ae0c48

  Copy full SHA for 2ae0c48

• Update search to groupedand.

  MMasey

  committed
  03f85a8

  Copy full SHA for 03f85a8

• updates for categories API and feed

  crgrieve

  committed
  8f7ef68

  Copy full SHA for 8f7ef68

• Moved scripts into a single script file, added functionality for displaying most recent high fives, with a mock API response.

  cssquirrel

  committed
  00a26ff

  Copy full SHA for 00a26ff

Commits on May 21, 2018

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  crgrieve

  committed
  b4c7232

  Copy full SHA for b4c7232

• merge after conflict

  crgrieve

  committed
  16568f3

  Copy full SHA for 16568f3

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  crgrieve

  committed
  c56e76a

  Copy full SHA for c56e76a

• fixing merge

  crgrieve

  committed
  15180b5

  Copy full SHA for 15180b5

• Added periodic polling to keep the high fives up to date.

  cssquirrel

  committed
  6b69dc2

  Copy full SHA for 6b69dc2

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  cssquirrel

  committed
  52fb221

  Copy full SHA for 52fb221

• Load categories, typeahead member search

  hartvig

  committed
  c16fb58

  Copy full SHA for c16fb58

• Replaced OrcAjax and other functionality with jQuery and lodash functionality as those libraries exist already on Our.Umbraco.

  cssquirrel

  committed
  4f4978f

  Copy full SHA for 4f4978f

• Re-inserted accidentally removed scripts.

  cssquirrel

  committed
  0afb1e8

  Copy full SHA for 0afb1e8

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  hartvig

  committed
  f108b1e

  Copy full SHA for f108b1e

• This merge won't go well, I'll fix in a sec

  hartvig

  committed
  03ec949

  Copy full SHA for 03ec949

• adding migration and updating api

  crgrieve

  committed
  9f96122

  Copy full SHA for 9f96122

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  crgrieve

  committed
  5583efa

  Copy full SHA for 5583efa

• merge fix

  hartvig

  committed
  d3b54c2

  Copy full SHA for d3b54c2

• Fixed lodash unique array merge for the highFives list.

  cssquirrel

  committed
  9ca6651

  Copy full SHA for 9ca6651

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  cssquirrel

  committed
  1b7b374

  Copy full SHA for 1b7b374

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  hartvig

  committed
  0835fca

  Copy full SHA for 0835fca

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  hartvig

  committed
  ff90e27

  Copy full SHA for ff90e27

• updating API

  crgrieve

  committed
  f3ea271

  Copy full SHA for f3ea271

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  crgrieve

  committed
  b3e9601

  Copy full SHA for b3e9601

• fixing merge issues on api

  crgrieve

  committed
  9856a39

  Copy full SHA for 9856a39

• Reworking umbrcians search.

  MMasey

  committed
  d9266b6

  Copy full SHA for d9266b6

• Populate category dropdown with category info from API endpoint (and mock).

  cssquirrel

  committed
  651f667

  Copy full SHA for 651f667

• Removed duplicate code, removed hard-wired categories, added suggestion list <ul>.

  cssquirrel

  committed
  f79c9d9

  Copy full SHA for f79c9d9

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  Show description for 362d7d3
  cssquirrel

  committed
  362d7d3

  Copy full SHA for 362d7d3

• Post-merge cleanup of script, markup for form.

  cssquirrel

  committed
  67fb069

  Copy full SHA for 67fb069

• Set up functionality and mock API response for getting the suggested members from the member search field.

  cssquirrel

  committed
  2f9725d

  Copy full SHA for 2f9725d

• Add update to people service and highfive controller.

  MMasey

  committed
  0fa6267

  Copy full SHA for 0fa6267

• retrieve feed logic

  crgrieve

  committed
  44396f0

  Copy full SHA for 44396f0

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  crgrieve

  committed
  405a860

  Copy full SHA for 405a860

• Add get random people endpoint.

  MMasey

  committed
  3dd6e36

  Copy full SHA for 3dd6e36

• Styling high five items

  hartvig

  committed
  378bc82

  Copy full SHA for 378bc82

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  hartvig

  committed
  f412cbd

  Copy full SHA for f412cbd

• Bound functionality for selecting a member to track the member updated.

  cssquirrel

  committed
  3bb3fc1

  Copy full SHA for 3bb3fc1

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  cssquirrel

  committed
  35e4636

  Copy full SHA for 35e4636

• database schema change and api work

  crgrieve

  committed
  2dbf6e3

  Copy full SHA for 2dbf6e3

• Integrated design changes to markup for the activity list for high fives.

  cssquirrel

  committed
  5f6bda6

  Copy full SHA for 5f6bda6

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  cssquirrel

  committed
  e3a0ae5

  Copy full SHA for e3a0ae5

• API feed updates

  crgrieve

  committed
  cd17e2f

  Copy full SHA for cd17e2f

• Added in functionality to get random members for placeholder from API.

  cssquirrel

  committed
  016c5d5

  Copy full SHA for 016c5d5

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  cssquirrel

  committed
  ba8c416

  Copy full SHA for ba8c416

• Added submit form functionality and mock.

  cssquirrel

  committed
  4e822b5

  Copy full SHA for 4e822b5

• Switched off mock API.

  cssquirrel

  committed
  748f422

  Copy full SHA for 748f422

• removing fromid

  crgrieve

  committed
  8b30bb9

  Copy full SHA for 8b30bb9

• Fixed to highfives.js

  MMasey

  committed
  c4a67c7

  Copy full SHA for c4a67c7

• Polyfill for unionBy functionality due to version of lodash being too low.

  cssquirrel

  committed
  1be9ea9

  Copy full SHA for 1be9ea9

• Fix hight five feed bugs.

  MMasey

  committed
  cbd737a

  Copy full SHA for cbd737a

• fixing categories

  crgrieve

  committed
  ef72dbb

  Copy full SHA for ef72dbb

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  crgrieve

  committed
  3495ef9

  Copy full SHA for 3495ef9

• Randomized compliments and re-load high fives after submission.

  cssquirrel

  committed
  75e1142

  Copy full SHA for 75e1142

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  cssquirrel

  committed
  973c749

  Copy full SHA for 973c749

• Remove logged in user from results.

  MMasey

  committed
  04247c3

  Copy full SHA for 04247c3

• Added more compliments.

  cssquirrel

  committed
  e82a3cd

  Copy full SHA for e82a3cd

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  cssquirrel

  committed
  eb1c7cc

  Copy full SHA for eb1c7cc

• DB Id migration update

  crgrieve

  committed
  70cb32a

  Copy full SHA for 70cb32a

• Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbraco into temp-high-five

  crgrieve

  committed
  bc47adc

  Copy full SHA for bc47adc

Commits on May 22, 2018

• avatar checks

  crgrieve

  committed
  8482769

  Copy full SHA for 8482769

• fixing null check

  crgrieve

  committed
  8729eb4

  Copy full SHA for 8729eb4

Commits on May 23, 2018

• Add a little FE love.

  MMasey

  committed
  351347d

  Copy full SHA for 351347d

Commits on May 28, 2018

• Refactoring to service to be reusable

  crgrieve

  committed
  f538b71

  Copy full SHA for f538b71

Commits on May 29, 2018

• fixing profile high five feed

  crgrieve

  committed
  6d5dad9

  Copy full SHA for 6d5dad9

Commits on May 30, 2018

• Adding title tag for high five link.

  crgrieve

  committed
  b556c43

  Copy full SHA for b556c43

Commits on May 31, 2018

• Tidy up css & markup. Begin work for updated member suggestion controls.

  MMasey

  committed
  5edeae2

  Copy full SHA for 5edeae2

• Remove unionBy logic for the time being. Fix bug where feed wasn't updating on form submit.

  MMasey

  committed
  0985e25

  Copy full SHA for 0985e25

Commits on Jun 3, 2018

• paging logic for sql query

  crgrieve

  committed
  6fb1281

  Copy full SHA for 6fb1281

Commits on Jun 9, 2018

• adding dynamic preview box

  crgrieve

  committed
  320ad84

  Copy full SHA for 320ad84

Commits on Jun 10, 2018

• fixing preview high five styles

  crgrieve

  committed
  3a941ad

  Copy full SHA for 3a941ad

• show relevant profile in preview

  crgrieve

  committed
  d0dadb4

  Copy full SHA for d0dadb4

• fix for non http urls

  crgrieve

  committed
  a1bb8ed

  Copy full SHA for a1bb8ed

Commits on Jun 16, 2018

• high fives for members update

  Show description for 4928053
  crgrieve

  committed
  4928053

  Copy full SHA for 4928053

• Add whatInput library. It is used to help display the focus ring when required, which is great for accessibility.

  MMasey

  committed
  1ef9f63

  Copy full SHA for 1ef9f63

• Refactor HighFive FE & BE, add WIF for preview, add basic validation for url input, add more compliments from retreat.

  MMasey

  committed
  441ce22

  Copy full SHA for 441ce22

Commits on Jul 8, 2018

• refactoring & comments.

  Show description for c348162
  crgrieve

  committed
  c348162

  Copy full SHA for c348162

• reset preview after submit.

  Show description for e18b4ec
  crgrieve

  committed
  e18b4ec

  Copy full SHA for e18b4ec