Code

update from original#1

Code

Merged

janmichaelyu merged 153 commits intojanmichaelyu:masterjanmichaelyu/slush-marklogic-node:masterfrom marklogic-community:mastermarklogic-community/slush-marklogic-node:masterCopy head branch name to clipboardDec 11, 2015

+3,438-1,627

Commits

Commits on Aug 25, 2015

• updating css designs. adding separate files. added classes to the root and search files

  jenbreese

  committed
  d825a09

  Copy full SHA for d825a09

Commits on Aug 26, 2015

• updating to latest bower dependencies

  Show description for f6ff14e
  paxtonhare

  committed
  f6ff14e

  Copy full SHA for f6ff14e

Commits on Aug 27, 2015

• making things version agnostic

  paxtonhare

  committed
  0a4de33

  Copy full SHA for 0a4de33

Commits on Aug 28, 2015

• Merge branch 'master' of https://github.com/marklogic/slush-marklogic-node

  jenbreese

  committed
  ebe7636

  Copy full SHA for ebe7636

Commits on Aug 31, 2015

• Adding Similar Items to the detail page

  Show description for 1b955f6
  

  Bruce Holt

  committed
  1b955f6

  Copy full SHA for 1b955f6

• Merge pull request #123 from bluetorch/similar-items

  Show description for 60b5c0c
  paxtonhare

  committed
  60b5c0c

  Copy full SHA for 60b5c0c

• Merge pull request #122 from paxtonhare/update-bower-deps-again

  Show description for 0be1875
  ryanjdew

  committed
  0be1875

  Copy full SHA for 0be1875

Commits on Sep 1, 2015

• Add snippet size control

  mariannemyers

  committed
  670e8e3

  Copy full SHA for 670e8e3

• #130 Address PR comment, now use ctrl.

  mariannemyers

  committed
  c8d161c

  Copy full SHA for c8d161c

• Move login out as service and add httpintercept for login prompt

  Show description for a4951b9
  ryanjdew

  committed
  a4951b9

  Copy full SHA for a4951b9

Commits on Sep 2, 2015

• #130 Only use the URI as the search result title. Further discussion to come

  mariannemyers

  committed
  be1c64c

  Copy full SHA for be1c64c

Commits on Sep 3, 2015

• Make sure redirects happen for top-right and modal

  ryanjdew

  committed
  1d868ac

  Copy full SHA for 1d868ac

• Merge pull request #121 from jenbreese/master

  Show description for b767bf7
  grtjn

  committed
  b767bf7

  Copy full SHA for b767bf7

• Increased version number

  grtjn

  committed
  82a6148

  Copy full SHA for 82a6148

• Merge pull request #130 from mariannemyers/snippet-size

  Show description for faa5ccc
  paxtonhare

  committed
  faa5ccc

  Copy full SHA for faa5ccc

• Merge pull request #127 from ryanjdew/login-service

  Show description for 02c05a2
  paxtonhare

  committed
  02c05a2

  Copy full SHA for 02c05a2

• Providing scripts/docs to run app as service

  

  Bruce Holt

  committed
  bc65ae3

  Copy full SHA for bc65ae3

• Merge pull request #129 from bluetorch/run-as-service

  Show description for fa48868
  paxtonhare

  committed
  fa48868

  Copy full SHA for fa48868

• Fix user tests to reflect login service changes

  ryanjdew

  committed
  f4cbe8a

  Copy full SHA for f4cbe8a

• Merge pull request #150 from ryanjdew/user-tests

  Show description for c4d9f2a
  paxtonhare

  committed
  c4d9f2a

  Copy full SHA for c4d9f2a

• Added negated facets in by default. Added new version of ml-search-ng to

  Show description for 41a4fca
  hunterwilliams

  committed
  41a4fca

  Copy full SHA for 41a4fca

• Update installation instructions in README

  Show description for 0f6ffb3
  patrickmcelwee

  committed
  0f6ffb3

  Copy full SHA for 0f6ffb3

• Prompts for ports and overwrites in gulp.config.js and

  Show description for d81a91e
  hunterwilliams

  committed
  d81a91e

  Copy full SHA for d81a91e

Commits on Sep 4, 2015

• Merge pull request #154 from patrickmcelwee/readme_installation

  Show description for 6b20627
  paxtonhare

  committed
  6b20627

  Copy full SHA for 6b20627

• Merge pull request #113 from hunterwilliams/port-specification

  Show description for 6778d32
  paxtonhare

  committed
  6778d32

  Copy full SHA for 6778d32

• Merge pull request #125 from hunterwilliams/negated-facet-support

  Show description for a3b8bf7
  paxtonhare

  committed
  a3b8bf7

  Copy full SHA for a3b8bf7

• Adds MarkLogic's newest favicon and adds it to index.html

  hunterwilliams

  committed
  a5cc021

  Copy full SHA for a5cc021

• Changed sample docs out for a sample zip. Changed instructions in readme

  Show description for b0a72d1
  hunterwilliams

  committed
  b0a72d1

  Copy full SHA for b0a72d1

• Added no-cache headers to requests on get/post/put & login/user status

  Show description for e28b267
  hunterwilliams

  committed
  e28b267

  Copy full SHA for e28b267

• Changed mlcp commands to add collections/perms as well as use options file

  hunterwilliams

  committed
  5fd3580

  Copy full SHA for 5fd3580

Commits on Sep 6, 2015

• Moves over status check from userservice to loginservice. Does not resolve

  Show description for 9573109
  hunterwilliams

  committed
  9573109

  Copy full SHA for 9573109

Commits on Sep 7, 2015

• Merge pull request #155 from hunterwilliams/favicon

  Show description for a4702d5
  grtjn

  committed
  a4702d5

  Copy full SHA for a4702d5

• Fixes #160: added collection facet, added comments, removed verbose search: prefix

  grtjn

  committed
  51eb778

  Copy full SHA for 51eb778

• Fixed #147: added similar sidebar to esri details, synched presentation between esri/no-esri

  grtjn

  committed
  b570fe2

  Copy full SHA for b570fe2

• Fixed #144: fixed issue with add/remove tags on create page

  grtjn

  committed
  e033d15

  Copy full SHA for e033d15

• Moved nocache into function and added legacy nocache headers

  hunterwilliams

  committed
  a006393

  Copy full SHA for a006393

• Updated relevant content in main readme.mdown. Also fixed doc count/extra

  Show description for b979f1b
  hunterwilliams

  committed
  b979f1b

  Copy full SHA for b979f1b

• Emphasized the app-role change necessity and added command to find it

  hunterwilliams

  committed
  9a84dbe

  Copy full SHA for 9a84dbe

• Fixed #135: handle app-port arg properly, only open debug port when debug flag

  grtjn

  committed
  0a6f484

  Copy full SHA for 0a6f484

Commits on Sep 8, 2015

• Made it so userservice will properly ask loginservice to check if logged

  Show description for bac416e
  hunterwilliams

  committed
  bac416e

  Copy full SHA for bac416e

• Fixes getting logged in before page load. Breaks stopping requests quickly

  hunterwilliams

  committed
  c0a1d14

  Copy full SHA for c0a1d14

• Better data distribution. More eyeColors/fruits

  hunterwilliams

  committed
  bae5316

  Copy full SHA for bae5316

• Fixed #85: added robots.txt

  grtjn

  committed
  22b7c7c

  Copy full SHA for 22b7c7c

• Do not ask for appname twice

  Show description for a0a0816
  patrickmcelwee

  committed
  a0a0816

  Copy full SHA for a0a0816

• Merge pull request #153 from patrickmcelwee/do_not_ask_for_appname_twice

  Show description for 208118f
  grtjn

  committed
  208118f

  Copy full SHA for 208118f

• Fixed #84: minor patch for analyze-data to support JSON

  grtjn

  committed
  85f0d84

  Copy full SHA for 85f0d84

• Merge pull request #173 from grtjn/84-analyze-json

  Show description for 53fd6a8
  grtjn

  committed
  53fd6a8

  Copy full SHA for 53fd6a8

• Fixed #148: stub mlpm.json to make mlpm install slightly easier

  grtjn

  committed
  1c5ab58

  Copy full SHA for 1c5ab58

• Merge pull request #164 from grtjn/148-mlpm-json

  Show description for 6787fb0
  joemfb

  committed
  6787fb0

  Copy full SHA for 6787fb0

Commits on Sep 9, 2015

• Added generated CHANGELOG

  grtjn

  committed
  17f4867

  Copy full SHA for 17f4867

• Merge pull request #166 from grtjn/144-fix-tags

  Show description for 0c0c3a1
  grtjn

  committed
  0c0c3a1

  Copy full SHA for 0c0c3a1

• Merge pull request #157 from hunterwilliams/more-sample-docs

  Show description for ec79691
  grtjn

  committed
  ec79691

  Copy full SHA for ec79691

• Merge pull request #172 from grtjn/85-robots-txt

  Show description for 2e69c3f
  grtjn

  committed
  2e69c3f

  Copy full SHA for 2e69c3f

• Merge pull request #165 from grtjn/147-similar-esri

  Show description for 27128a3
  grtjn

  committed
  27128a3

  Copy full SHA for 27128a3

• Merge pull request #163 from grtjn/160-collection-facet

  Show description for 64eda42
  grtjn

  committed
  64eda42

  Copy full SHA for 64eda42

• Updated CHANGELOG

  grtjn

  committed
  f1efd4c

  Copy full SHA for f1efd4c

• Made it so that search options query on data collection, similar docs only

  Show description for faff40e
  hunterwilliams

  committed
  faff40e

  Copy full SHA for faff40e

• Merge pull request #158 from hunterwilliams/no-cache

  Show description for c550a83
  grtjn

  committed
  c550a83

  Copy full SHA for c550a83

• Merge pull request #162 from hunterwilliams/data-search

  Show description for 55beb87
  grtjn

  committed
  55beb87

  Copy full SHA for 55beb87

Commits on Sep 10, 2015

• Fixed lint error and made tag test work properly

  hunterwilliams

  committed
  4a8f356

  Copy full SHA for 4a8f356

• fixed issue #149 and #142. also removed the extra spacing on the login page.

  jenbreese

  committed
  3eeef0b

  Copy full SHA for 3eeef0b

• fixing the colors for all designs per bug #171

  jenbreese

  committed
  7e2551a

  Copy full SHA for 7e2551a

• adding the missing logo for #156

  jenbreese

  committed
  0ef5905

  Copy full SHA for 0ef5905

• removed the powered by that did not fit the design standards from Marketing #156

  jenbreese

  committed
  2271563

  Copy full SHA for 2271563

• removed the powered by in the footer because the logo cannot be on a dark background per design standards

  jenbreese

  committed
  7204cfe

  Copy full SHA for 7204cfe

Commits on Sep 11, 2015

• Adds app name to session variable. Slushfile now replaces @sample-app

  hunterwilliams

  committed
  0fbfdae

  Copy full SHA for 0fbfdae

• Moved replace to correct package.json

  hunterwilliams

  committed
  ea18f0b

  Copy full SHA for ea18f0b

• Generate a uuid for secret each slush generation

  hunterwilliams

  committed
  094c912

  Copy full SHA for 094c912

• Merge pull request #170 from grtjn/135-gulp-app-port

  Show description for 0b1658e
  grtjn

  committed
  0b1658e

  Copy full SHA for 0b1658e

• Merge pull request #174 from jenbreese/master

  Show description for 3ad9fce
  grtjn

  committed
  3ad9fce

  Copy full SHA for 3ad9fce

• Merge pull request #179 from hunterwilliams/create-controller-fix

  Show description for f879601
  grtjn

  committed
  f879601

  Copy full SHA for f879601

• removing the redunant unused style and adding height #156

  jenbreese

  committed
  74f8dee

  Copy full SHA for 74f8dee

• Merge pull request #181 from jenbreese/master

  Show description for 0b266b1
  grtjn

  committed
  0b266b1

  Copy full SHA for 0b266b1

Commits on Sep 14, 2015

• Synched verions in json, made them private, added replacing title to index

  Show description for 3813b1c
  hunterwilliams

  committed
  3813b1c

  Copy full SHA for 3813b1c

• Made it so that the emails can't be added if blank and that they add on

  Show description for 253ebf6
  hunterwilliams

  committed
  253ebf6

  Copy full SHA for 253ebf6

• Merge pull request #180 from hunterwilliams/app-secret

  Show description for 88a16d0
  grtjn

  committed
  88a16d0

  Copy full SHA for 88a16d0

Commits on Sep 15, 2015

• Merge remote-tracking branch 'upstream/master' into login-status-fix

  hunterwilliams

  committed
  13a00bd

  Copy full SHA for 13a00bd

• updating the chiclets to show an icon with ban/add

  jenbreese

  committed
  f8ed46e

  Copy full SHA for f8ed46e

• minor edit to #182 to put back the default design

  jenbreese

  committed
  0f9babb

  Copy full SHA for 0f9babb

• Merge pull request #182 from jenbreese/master

  Show description for fffd5bd
  grtjn

  committed
  fffd5bd

  Copy full SHA for fffd5bd

• changing the layout for tags #144

  jenbreese

  committed
  ae7de2e

  Copy full SHA for ae7de2e

• Merge pull request #186 from jenbreese/master

  Show description for 4c80751
  grtjn

  committed
  4c80751

  Copy full SHA for 4c80751

Commits on Sep 16, 2015

• @grtjn suggested changes

  hunterwilliams

  committed
  b6b361b

  Copy full SHA for b6b361b

• Protected root.search by default....

  hunterwilliams

  committed
  3c9d3e6

  Copy full SHA for 3c9d3e6

• Merge pull request #183 from hunterwilliams/email-fix

  Show description for b8bcf0d
  grtjn

  committed
  b8bcf0d

  Copy full SHA for b8bcf0d

• Fixed login test

  hunterwilliams

  committed
  4628382

  Copy full SHA for 4628382

• Added comment and removed console.warn

  hunterwilliams

  committed
  1abf426

  Copy full SHA for 1abf426

• # This is a combination of 9 commits.

  Show description for e283214
  hunterwilliams

  committed
  e283214

  Copy full SHA for e283214

• Made gulp use a gulp-{env}.json file and added choosing the hostname to

  Show description for 46a1dad
  hunterwilliams

  committed
  46a1dad

  Copy full SHA for 46a1dad

• Merge pull request #185 from hunterwilliams/seperate-config

  Show description for aab0e98
  grtjn

  committed
  aab0e98

  Copy full SHA for aab0e98

• Merge branch 'master' into login-status-fix

  hunterwilliams

  committed
  6b1a69f

  Copy full SHA for 6b1a69f

• Fixed #67,#176: minor changes to proxying to smoothen things a bit

  grtjn

  committed
  67ded4c

  Copy full SHA for 67ded4c

• Merge pull request #177 from grtjn/31-67-176-proxy

  Show description for c5780cc
  grtjn

  committed
  c5780cc

  Copy full SHA for c5780cc

• Merge pull request #168 from hunterwilliams/login-status-fix

  Show description for 42e72fd
  grtjn

  committed
  42e72fd

  Copy full SHA for 42e72fd

• Undoing show-more change, see #137

  grtjn

  committed
  9b1cc60

  Copy full SHA for 9b1cc60

• Merge pull request #190 from grtjn/137-disable-show-more

  Show description for d5a61c1
  grtjn

  committed
  d5a61c1

  Copy full SHA for d5a61c1

Commits on Sep 17, 2015

• Made it so that app-user and admin-user now live in local.json and are

  Show description for 3e5dbc7
  hunterwilliams

  committed
  3e5dbc7

  Copy full SHA for 3e5dbc7

• Fixed #193: show result.label if exists

  Show description for ea095c6
  grtjn

  committed
  ea095c6

  Copy full SHA for ea095c6

• Fixed #195: typo in MLCP command

  grtjn

  committed
  d39bf30

  Copy full SHA for d39bf30

• Fixed #195: typo in MLCP command

  grtjn

  committed
  69045df

  Copy full SHA for 69045df

• Merge pull request #196 from marklogic/193-result-label

  Show description for aeb6750
  grtjn

  committed
  aeb6750

  Copy full SHA for aeb6750

• Merge pull request #198 from marklogic/195-mlcp-typo

  Show description for 017ea07
  grtjn

  committed
  017ea07

  Copy full SHA for 017ea07

• Merge pull request #199 from marklogic/195-mlcp-typo-1

  Show description for ad1dd1e
  grtjn

  committed
  ad1dd1e

  Copy full SHA for ad1dd1e

• Fixed typo in PR for #195

  grtjn

  committed
  35e7962

  Copy full SHA for 35e7962

• Merge pull request #202 from marklogic/fixed-typo-for-195

  Show description for b18e1ed
  grtjn

  committed
  b18e1ed

  Copy full SHA for b18e1ed

Commits on Sep 18, 2015

• Fixed using gulp-local.json to local.json

  hunterwilliams

  committed
  55844a0

  Copy full SHA for 55844a0

• Binary corruption fix in gulp replace

  hunterwilliams

  committed
  49f2259

  Copy full SHA for 49f2259

• Removed using deprecated express send method

  hunterwilliams

  committed
  da31399

  Copy full SHA for da31399

• Merge pull request #204 from hunterwilliams/deprecated-express

  Show description for 7662194
  joemfb

  committed
  7662194

  Copy full SHA for 7662194

• Merge pull request #203 from hunterwilliams/binary-corruption

  Show description for c1741c1
  grtjn

  committed
  c1741c1

  Copy full SHA for c1741c1

• Made admin password blank by default and adds message

  hunterwilliams

  committed
  7a676b7

  Copy full SHA for 7a676b7

• Merge pull request #192 from hunterwilliams/user-fix

  Show description for c86f86b
  grtjn

  committed
  c86f86b

  Copy full SHA for c86f86b

Commits on Sep 21, 2015

• Added replacing sample-app-role and changed replacing sample-app to

  Show description for 69691cd
  hunterwilliams

  committed
  69691cd

  Copy full SHA for 69691cd

Commits on Sep 23, 2015

• Changed gulp-local.json to local.json

  hunterwilliams

  committed
  baba003

  Copy full SHA for baba003

• Removed esri option

  hunterwilliams

  committed
  301005c

  Copy full SHA for 301005c

• Fixed #200: build mode should look at dist/

  grtjn

  committed
  c1035ed

  Copy full SHA for c1035ed

• Fixed #223: .live after SOURCE_DIR was missing

  grtjn

  committed
  3414e83

  Copy full SHA for 3414e83

• fixing the flow with wiredep. Turns out that running it when files change is bad.

  paxtonhare

  committed
  1fd0097

  Copy full SHA for 1fd0097

• Merge pull request #219 from hunterwilliams/disable-esri

  Show description for bf44634
  paxtonhare

  committed
  bf44634

  Copy full SHA for bf44634

• Merge pull request #209 from hunterwilliams/app-role-replace

  Show description for 63561b5
  paxtonhare

  committed
  63561b5

  Copy full SHA for 63561b5

• Merge pull request #218 from hunterwilliams/fix-ignore

  Show description for 2cbd18c
  paxtonhare

  committed
  2cbd18c

  Copy full SHA for 2cbd18c

Commits on Sep 24, 2015

• Ignore google fonts import during minification

  hunterwilliams

  committed
  2aeccf5

  Copy full SHA for 2aeccf5

• Adding Similar Items to the detail page

  Show description for afde88d
  janmichaelyu

  committed
  afde88d

  Copy full SHA for afde88d

• fixed detail showing similar links

  janmichaelyu

  committed
  e49683c

  Copy full SHA for e49683c

• Used override to fix highlightjs to come before angular-highlightjs

  hunterwilliams

  committed
  d734e63

  Copy full SHA for d734e63

• fixing tab to show raw data and converted, adding download link for binary

  janmichaelyu

  committed
  ba5fd4b

  Copy full SHA for ba5fd4b

• Merge pull request #227 from paxtonhare/run-wiredep-after-bower-install

  Show description for 0e9eb77
  ryanjdew

  committed
  0e9eb77

  Copy full SHA for 0e9eb77

• Merge pull request #128 from janmichaelyu/details-page

  Show description for 0cee6eb
  grtjn

  committed
  0cee6eb

  Copy full SHA for 0cee6eb

• Merge pull request #224 from marklogic/223-etc-typo

  Show description for 2f3a98d
  grtjn

  committed
  2f3a98d

  Copy full SHA for 2f3a98d

• Merge pull request #225 from marklogic/222-build-mode

  Show description for 9db6fbb
  grtjn

  committed
  9db6fbb

  Copy full SHA for 9db6fbb

• Merge pull request #228 from hunterwilliams/font-import-fix

  Show description for b2cfe0d
  grtjn

  committed
  b2cfe0d

  Copy full SHA for b2cfe0d

• Merge pull request #230 from hunterwilliams/fix-highlight-dependency-order

  Show description for 55f8822
  grtjn

  committed
  55f8822

  Copy full SHA for 55f8822

• Fixes #139 bower dependency conflict

  Show description for 088cee5
  grtjn

  committed
  088cee5

  Copy full SHA for 088cee5

• Merge pull request #231 from marklogic/139-remove-ml-common-dep

  Show description for 2f27deb
  grtjn

  committed
  2f27deb

  Copy full SHA for 2f27deb

• Fixed #232: npm install had to run before bower install

  grtjn

  committed
  8fa3a86

  Copy full SHA for 8fa3a86

• Merge pull request #234 from grtjn/232-npm-first

  Show description for afc8a69
  grtjn

  committed
  afc8a69

  Copy full SHA for afc8a69

• fix for #235

  jenbreese

  committed
  570cdf2

  Copy full SHA for 570cdf2

• adding a little more spacing to the clear #235

  jenbreese

  committed
  a5f9852

  Copy full SHA for a5f9852

Commits on Sep 25, 2015

• Turned off browsersync ui off

  hunterwilliams

  committed
  6d1ad8c

  Copy full SHA for 6d1ad8c

• Made it so that /api/user/status pulls properly. Also filters out '' from

  Show description for baa3685
  hunterwilliams

  committed
  baa3685

  Copy full SHA for baa3685

• Merge pull request #237 from jenbreese/master

  Show description for 6419363
  grtjn

  committed
  6419363

  Copy full SHA for 6419363

• Made it so that profile is just directly mapped when sending

  hunterwilliams

  committed
  4fe40d7

  Copy full SHA for 4fe40d7

• Merge pull request #239 from hunterwilliams/browser-sync-ui-off

  Show description for 42dd441
  grtjn

  committed
  42dd441

  Copy full SHA for 42dd441

• Made it so that if no profile exists it still says youre logged in if you

  Show description for f923ca2
  hunterwilliams

  committed
  f923ca2

  Copy full SHA for f923ca2

• Ignore test coverage folder in git

  hunterwilliams

  committed
  62a3376

  Copy full SHA for 62a3376

• Merge pull request #244 from hunterwilliams/ignore-coverage

  Show description for f9c615c
  grtjn

  committed
  f9c615c

  Copy full SHA for f9c615c

• Merge pull request #238 from hunterwilliams/fix-updating-user

  Show description for 9f67975
  grtjn

  committed
  9f67975

  Copy full SHA for 9f67975

• Updated CHANGELOG

  grtjn

  committed
  951fdda

  Copy full SHA for 951fdda

• Update package.json

  grtjn

  committed
  e2ec09d

  Copy full SHA for e2ec09d

Commits on Oct 5, 2015

• Fixing the spacing as described in #252

  jenbreese

  committed
  868349b

  Copy full SHA for 868349b

• Merge pull request #253 from jenbreese/master

  Show description for 3859fc5
  ryanjdew

  committed
  3859fc5

  Copy full SHA for 3859fc5

Commits on Oct 13, 2015

• Update bower.json

  Show description for 453bd6b
  grtjn

  committed
  453bd6b

  Copy full SHA for 453bd6b

• Update package.json

  Show description for 7afd3e8
  grtjn

  committed
  7afd3e8

  Copy full SHA for 7afd3e8