Commit Graph

Select branches

Hide Pull Requests

CORL-1285

feature/CORL-1252

feature/CORL-1277-persp-fetch

feature/CORL-1282-hide-media-pref

feature/CORL-1293

feature/CORL-378

master

release/4

release/6

release/6.2

untagged-55d0b2382432564184ac

v0.0.1

v0.0.2

v0.0.3

v0.0.4

v1.0.0

v1.3.0

v1.4.0

v1.5.0

v1.5.1

v1.5.2

v1.5.3

v1.5.4

v1.6.0

v1.7.0

v1.8.0

v1.9.0

v1.9.1

v2.0.0

v2.0.1

v2.1.0

v2.2.0

v2.2.1

v2.3.0

v2.4.0

v2.4.1

v2.5.0

v3.0.0

v3.1.0

v3.2.0

v3.3.0

v3.4.0

v3.5.0

v3.5.1

v3.6.0

v3.6.1

v3.7.0

v3.7.1

v3.8.0

v3.8.1

v3.8.2

v3.8.3

v3.9.0

v3.9.1

v4.0.0

v4.1.0

v4.10.0

v4.10.1

v4.10.2

v4.10.3

v4.11.0

v4.11.1

v4.11.2

v4.11.3

v4.11.4

v4.11.5

v4.11.6

v4.2.0

v4.2.1

v4.2.2

v4.3.0

v4.3.1

v4.3.2

v4.4.0

v4.4.1

v4.4.2

v4.4.3

v4.5.0

v4.5.1

v4.6.0

v4.6.1

v4.6.10

v4.6.11

v4.6.2

v4.6.3

v4.6.4

v4.6.5

v4.6.6

v4.6.7

v4.6.8

v4.6.9

v4.7.0

v4.8.0

v4.8.1

v4.8.2

v4.8.3

v4.8.4

v4.8.5

v4.8.6

v4.8.7

v4.9.0

v4.9.1

v5.0.0

v5.0.0-beta.1

v5.0.0-beta.2

v5.0.0-beta.3

v5.0.0-beta.4

v5.0.0-beta.5

v5.0.0-beta.6

v5.0.0-beta.7

v5.0.0-beta.8

v5.1.0

v5.2.0

v5.2.1

v5.2.2

v5.3.0

v5.3.1

v5.3.2

v5.4.0

v5.4.1

v5.4.2

v5.5.0

v5.5.1

v6.0.0

v6.0.1

v6.0.2

v6.0.3

v6.1.0

v6.2.0

v6.2.1

v6.2.2

v6.2.3

v6.3.0

v6.3.1

v6.3.2

Mono Color

• 5408799ffd Merge pull request #61 from coralproject/i18n Gabriela Rodríguez BerónandGitHub 2016-11-11 10:54:06 -08:00
• a16959b432 Merge branch 'i18n' of https://github.com/coralproject/talk into i18n David Jay 2016-11-11 13:49:48 -05:00
• ba43e9d6dd Adding translations for comment post notifications. David Jay 2016-11-11 13:46:35 -05:00
• 8369f09bda Merge branch 'master' into permalinks-v2 Riley DavisandGitHub 2016-11-11 11:45:42 -07:00
• e2735759a6 first pass at permalink box Riley Davis 2016-11-11 11:27:39 -07:00
• aeefa89e0a Fix spanish translations. gaba 2016-11-11 09:22:05 -08:00
• 9174b0fcda Merge branch 'master' of https://github.com/coralproject/talk into i18n David Jay 2016-11-11 11:45:27 -05:00
• 309f53b359 Adding notifcation translations. David Jay 2016-11-11 11:44:50 -05:00
• ad01bc813f Removes script and change according to suggestion. gaba 2016-11-11 08:38:51 -08:00
• 35ef4af1ac Merge pull request #57 from coralproject/load-settings David ErwinandGitHub 2016-11-11 11:28:37 -05:00
• e279a46df5 Merge master into load-settings David Erwin 2016-11-11 11:24:44 -05:00
• f6c295ca78 Lint David Erwin 2016-11-11 11:16:19 -05:00
• 0c998e1196 Lint David Erwin 2016-11-11 11:15:11 -05:00
• 5b74beabd6 Community Section - Search Commenters (#60) Belén CurcioandDan Zajdband 2016-11-11 13:14:26 -03:00
• 4a704fa85c Merge pull request #54 from coralproject/lint-newlines David ErwinandGitHub 2016-11-11 10:37:04 -05:00
• 6c13e1c1c9 Added fallback for secret during testing Wyatt Johnson 2016-11-10 17:22:14 -07:00
• 6867760099 Initial pass at adding middleware for users Wyatt Johnson 2016-11-10 17:14:33 -07:00
• ce2b21b805 Merge branch 'master' into lint-newlines gaba 2016-11-10 15:09:49 -08:00
• ce206047f4 Merge branch 'master' into moving-to-queue gaba 2016-11-10 15:03:13 -08:00
• 7d5b79c6a0 Moved the moderation queue to its own folder and change the route to /queue/comments/pending gaba 2016-11-10 14:59:56 -08:00
• d7c02b53a7 Addressing formatting errors. David Jay 2016-11-10 17:51:39 -05:00
• 5df5bf65b9 Merge pull request #58 from coralproject/embeds David ErwinandGitHub 2016-11-10 17:39:24 -05:00
• d92295c35a Bit of lint David Erwin 2016-11-10 17:35:06 -05:00
• ff4e778dde Adding seperate translation files for packages. David Jay 2016-11-10 17:34:26 -05:00
• 75e1f86719 Create embed router David Erwin 2016-11-10 17:31:59 -05:00
• 6f7fe6ace7 Add embedding routes and homepage David Erwin 2016-11-10 17:12:32 -05:00
• 0ce892fe7a Loading settings and modifying commentbox to reflect pre and post-mod behavior. David Jay 2016-11-10 17:04:04 -05:00
• 8bf6bea5b9 Merge pull request #55 from coralproject/init-on-app-startup Riley DavisandGitHub 2016-11-10 13:34:58 -07:00
• 7a8cb90ebd Fix port scope bug David Erwin 2016-11-10 15:28:14 -05:00
• 95f3b86f3b cleaning up nested objects David Erwin 2016-11-10 15:24:34 -05:00
• f7249c4016 More linting and commenting David Erwin 2016-11-10 15:12:56 -05:00
• 677faebf76 adhere to new linting rules Riley Davis 2016-11-10 13:09:23 -07:00
• c698ae78a7 initialize settings in an init file before app accepts requests Riley Davis 2016-11-10 13:02:52 -07:00
• 89398120d5 Remove function keyword David Erwin 2016-11-10 14:57:57 -05:00
• d9dc198d46 Moved chained funcitons to multiple lines David Erwin 2016-11-10 14:52:05 -05:00
• 26f48196d9 Merge pull request #53 from coralproject/remove-queue-folder Gabriela Rodríguez BerónandGitHub 2016-11-10 10:33:22 -08:00
• fcd62140c6 Merge branch 'master' into remove-queue-folder David ErwinandGitHub 2016-11-10 13:27:25 -05:00
• 72cf149feb Merge pull request #51 from coralproject/reader-flags David ErwinandGitHub 2016-11-10 13:26:38 -05:00
• f4bc5d4e82 Merge and resolve an initial state bug David Erwin 2016-11-10 13:20:21 -05:00
• eb9e8f4713 Removes queue folder as we are already working on the moderation queue in comments. gaba 2016-11-10 09:36:52 -08:00
• e632632754 Merging and updating tests David Erwin 2016-11-10 12:16:58 -05:00
• 49744182f6 Merge pull request #50 from coralproject/auth David ErwinandGitHub 2016-11-10 11:46:38 -05:00
• 822f586888 Merge master and lint David Erwin 2016-11-10 11:37:14 -05:00
• 5e76e16b56 Merge pull request #49 from coralproject/actions-working David ErwinandGitHub 2016-11-10 10:55:06 -05:00
• a234eeb3ba Add json header, update status, and lint David Erwin 2016-11-10 10:49:55 -05:00
• 465437b04a Merge branch 'master' into actions-working David Erwin 2016-11-10 10:26:49 -05:00
• 499d3470e4 Merge pull request #46 from coralproject/queue David ErwinandGitHub 2016-11-10 10:16:37 -05:00
• b6a0a99d91 Update method name for clarity David Erwin 2016-11-10 10:10:55 -05:00
• 923edc7828 Merge branch 'master' into queue David Erwin 2016-11-10 10:07:07 -05:00
• 53001eafa3 Fixing linting error. David Jay 2016-11-09 22:44:43 -05:00
• b50c22a414 Merge branch 'master' of https://github.com/coralproject/talk into reader-flags David Jay 2016-11-09 22:44:12 -05:00
• 27896b8e42 Fixed tests for new users model Wyatt Johnson 2016-11-09 16:33:19 -07:00
• 6ef0d3ef41 Posting flags correctly and displaying flags when clicked. David Jay 2016-11-09 18:30:01 -05:00
• 42a7eee1a2 Merge branch 'master' into auth Wyatt JohnsonandGitHub 2016-11-09 16:28:39 -07:00
• c203bf16eb Improved tests and fixed them for new users model Wyatt Johnson 2016-11-09 16:26:23 -07:00
• 43a77e49c7 Merge pull request #42 from coralproject/update-settings-in-ui David ErwinandGitHub 2016-11-09 17:35:30 -05:00
• 9856c377eb Merge branch 'master' into update-settings-in-ui David ErwinandGitHub 2016-11-09 17:34:25 -05:00
• 99f0e77ce1 add(coral-admin): Working actions Dan Zajdband 2016-11-09 17:27:44 -05:00
• f6473972d8 Remove browser: true in favor of client's eslint file David Erwin 2016-11-09 17:19:44 -05:00
• 39654f34f2 Updating eslint as per @wyattjoh's request David Erwin 2016-11-09 17:15:39 -05:00
• 777dd9d4ed Merge branch 'update-settings-in-ui' of https://github.com/coralproject/talk into update-settings-in-ui David Erwin 2016-11-09 17:13:27 -05:00
• decb6747fd Comment out inactive Settings options David Erwin 2016-11-09 17:12:52 -05:00
• b7ee23d000 Updating commentstream to reflect new store structure. David Jay 2016-11-09 17:01:50 -05:00
• 49ea01049f Merge branch 'master' into update-settings-in-ui gaba 2016-11-09 13:57:19 -08:00
• d7ea18cba9 Fix linting problems. Remove comment of code. Add package. gaba 2016-11-09 13:52:47 -08:00
• c80bd19b85 Merge pull request #40 from coralproject/flagging-adapt-api David ErwinandGitHub 2016-11-09 16:46:56 -05:00
• 6ab561b91b Updating and passing coral-framework tests David Jay 2016-11-09 16:39:54 -05:00
• ef0016dbc1 Merge in master and lint David Erwin 2016-11-09 16:30:30 -05:00
• 74e162265b Merge branch 'master' into queue gaba 2016-11-09 12:40:31 -08:00
• d3b1cd04d5 Merge branch 'master' of github.com:coralproject/talk gaba 2016-11-09 12:40:22 -08:00
• eae2a0285b More tests and move settings stuff to routes and out of models. gaba 2016-11-09 12:35:59 -08:00
• ef22da5f29 Merge branch 'master' into auth Wyatt Johnson 2016-11-09 12:52:09 -07:00
• 0646645686 Added new cli interface + users model Wyatt Johnson 2016-11-09 12:51:32 -07:00
• 9ff2613ab4 Comment stream with new and approved when post-moderated. gaba 2016-11-09 11:40:57 -08:00
• c2f450d969 Merging master and linting David Erwin 2016-11-09 14:37:23 -05:00
• e0e80aa5cd Moving coral-framework tests over and updating mocha to transpile them. David Jay 2016-11-09 14:10:01 -05:00
• 255e459e26 Merge pull request #44 from coralproject/embed-link David ErwinandGitHub 2016-11-09 14:03:58 -05:00
• dc981a93a6 Merging in master David Erwin 2016-11-09 13:58:19 -05:00
• 13aabb9974 Re-adding notification length to config. David Jay 2016-11-09 13:54:44 -05:00
• 6616cf0c51 Uncommenting flags and hydrating actions. David Jay 2016-11-09 13:42:03 -05:00
• 694f894539 Merge pull request #43 from coralproject/client-eslint David ErwinandGitHub 2016-11-09 13:29:39 -05:00
• 07db6b3f9c Merge branch 'master' of https://github.com/coralproject/talk into reader-flags David Jay 2016-11-09 13:22:45 -05:00
• e9cf1004fc Merge branch 'embed-link' of https://github.com/coralproject/talk into embed-link David Jay 2016-11-09 13:16:51 -05:00
• eb146f286b Merge branch 'master' into client-eslint Wyatt Johnson 2016-11-09 11:16:21 -07:00
• 1e2f377329 Updating copied text padding. David Jay 2016-11-09 13:13:25 -05:00
• a7061c29a6 Merge branch 'master' into queue gaba 2016-11-09 09:34:57 -08:00
• 7cfa767a9f Merge branch 'master' of github.com:coralproject/talk gaba 2016-11-09 09:34:35 -08:00
• ab68b81f21 Add tests to stream on moderated comments. gaba 2016-11-09 09:33:15 -08:00
• 48d404137d Merge branch 'master' of github.com:coralproject/talk into queue gaba 2016-11-09 08:34:59 -08:00
• 3dcfb58134 Merge branch 'master' of github.com:coralproject/talk into flagging-adapt-api Belen Curcio 2016-11-09 13:08:26 -03:00
• f708271d00 Added missing babel plugin Wyatt Johnson 2016-11-09 09:03:25 -07:00
• 890bacc2e8 Merge pull request #38 from coralproject/community Dan ZajdbandandGitHub 2016-11-09 10:59:45 -05:00
• 4d0bacafd3 Merge branch 'master' into flagging-adapt-api Dan ZajdbandandGitHub 2016-11-09 10:46:50 -05:00
• c36604f7dd Merge branch 'community' of github.com:coralproject/talk into community Belen Curcio 2016-11-09 12:26:55 -03:00
• e0512bbe92 Merge branch 'master' of github.com:coralproject/talk into community Belen Curcio 2016-11-09 12:19:29 -03:00
• 6784612b61 Merge branch 'master' into embed-link Wyatt JohnsonandGitHub 2016-11-09 08:13:41 -07:00
• 6aae992a45 Merge branch 'master' into community Wyatt JohnsonandGitHub 2016-11-09 08:02:37 -07:00
• 6dee464eec Merge pull request #45 from coralproject/build-errors Dan ZajdbandandGitHub 2016-11-09 10:00:31 -05:00
• e638d2785b Some dep fixes which will hopefully resolve the CI issues Wyatt Johnson 2016-11-09 07:53:34 -07:00
• 72d01539fa Adding version and env Belen Curcio 2016-11-09 10:16:07 -03:00