wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-13 17:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • f06edec6a2 Merge branch 'master' of github.com:coralproject/talk into moderate-bio David Jay 2017-01-26 16:38:43 -05:00
  • b6d8a90084 Updating style of UserActions and moving ActionButton to its own component. David Jay 2017-01-26 16:36:43 -05:00
  • 3d08d1f54f Merge branch 'master' into e2e-env-fix David Erwin 2017-01-26 16:30:14 -05:00
  • b35336d1ed Merge pull request #260 from coralproject/hide-premod-links David Erwin 2017-01-26 16:28:48 -05:00
  • f42b8f324a Merge branch 'master' into hide-premod-links David Erwin 2017-01-26 16:24:06 -05:00
  • 30583cd93f Merge pull request #261 from coralproject/collapse-replies David Erwin 2017-01-26 16:21:07 -05:00
  • 2086bd7b72 Merge branch 'master' into collapse-replies David Erwin 2017-01-26 16:17:23 -05:00
  • fe62c1a739 Merge pull request #257 from coralproject/refresh-data-fix David Erwin 2017-01-26 16:15:55 -05:00
  • 06331d3c07 Updating bio moderation to graphQL architecture. David Jay 2017-01-26 15:31:15 -05:00
  • 2ad27ef6f9 add a cancel button to the reply box Riley Davis 2017-01-26 13:21:23 -07:00
  • 3cbe8bb7ac Stream now tracks what reply box is open Riley Davis 2017-01-26 12:45:14 -07:00
  • 963fc1f091 Merge branch 'e2e-env-fix' of github.com:coralproject/talk into e2e-env-fix David Jay 2017-01-26 14:41:41 -05:00
  • 2e34f726eb Updating tests to reflect graphql changes. David Jay 2017-01-26 14:41:03 -05:00
  • 58c4d5ceb5 Comment button order Belen Curcio 2017-01-26 16:09:56 -03:00
  • dc89b22abb Clicking user goes to Settings Tab Belen Curcio 2017-01-26 15:39:16 -03:00
  • afb246b173 Hiding premod links David Erwin 2017-01-26 10:46:01 -05:00
  • 48cc82b039 Merge branch 'master' into e2e-env-fix Wyatt Johnson 2017-01-26 07:59:01 -07:00
  • 88169526c3 Missing semicolon Belen Curcio 2017-01-26 10:50:53 -03:00
  • 4a54c571ed Open Stream and Closed Stream status Belen Curcio 2017-01-26 10:45:50 -03:00
  • 853981e21f Working configure tab and refresh data. Adding uncontrolled components, deleting state Belen Curcio 2017-01-26 10:19:49 -03:00
  • 74bef18098 user checker Belen Curcio 2017-01-26 09:34:47 -03:00
  • 64ed10845b Merge Belen Curcio 2017-01-25 21:59:42 -03:00
  • 0b73f18eb3 Merge pull request #258 from coralproject/streams-by-asset-id David Erwin 2017-01-25 17:48:41 -05:00
  • 1a065ffa51 Merge branch 'streams-by-asset-id' of https://github.com/coralproject/talk into streams-by-asset-id David Erwin 2017-01-25 17:45:09 -05:00
  • c4256fd27b Ditch console logs David Erwin 2017-01-25 17:44:21 -05:00
  • aa83aea849 Merge branch 'master' of github.com:coralproject/talk into e2e-env-fix David Jay 2017-01-25 17:17:04 -05:00
  • 31abe57cb2 Merge branch 'master' of github.com:coralproject/talk into moderate-bio David Jay 2017-01-25 17:15:12 -05:00
  • 000f2c64bb Merge branch 'master' into streams-by-asset-id Wyatt Johnson 2017-01-25 14:50:51 -07:00
  • 34ca36822f Merge pull request #259 from coralproject/graphql-abstraction Wyatt Johnson 2017-01-25 14:50:42 -07:00
  • 0035037583 Merge branch 'master' into graphql-abstraction Wyatt Johnson 2017-01-25 14:32:52 -07:00
  • 693e92a627 Moved the graphql file out of the string Wyatt Johnson 2017-01-25 14:31:11 -07:00
  • b4abb9724e Fix homepage bug David Erwin 2017-01-25 15:59:08 -05:00
  • 9764631a37 Fix asset search skip limit bug David Erwin 2017-01-25 15:37:18 -05:00
  • e320a9dd20 Merge branch 'master' into streams-by-asset-id David Erwin 2017-01-25 15:30:44 -05:00
  • 1f1b1d43ae Add useful links David Erwin 2017-01-25 15:27:38 -05:00
  • 29e69a66bb Add basic index page for assets David Erwin 2017-01-25 15:23:02 -05:00
  • 9598c55466 Merge pull request #256 from coralproject/graoh-fixes Wyatt Johnson 2017-01-25 13:16:05 -07:00
  • ec0dd34d40 Configure tab while you are loggedOff Belen Curcio 2017-01-25 16:33:55 -03:00
  • ad9684acd9 Create load stream by id route David Erwin 2017-01-25 14:08:19 -05:00
  • 91402a3e8b Moved PID into util.js Wyatt Johnson 2017-01-25 11:57:40 -07:00
  • edf9ced454 Added PID support Wyatt Johnson 2017-01-25 11:11:33 -07:00
  • 7c132600f0 Console log and typo Belen Curcio 2017-01-25 11:47:35 -03:00
  • b3eb3e3c43 Updated tests for Comment History Belen Curcio 2017-01-25 11:44:51 -03:00
  • d19d2ebe48 My Comment History Working - linted Belen Curcio 2017-01-25 11:19:34 -03:00
  • 30b6f8d112 my Comment History working 🎉 : TADA : Belen Curcio 2017-01-25 11:04:23 -03:00
  • 14483a39a0 Tests passing, removing legacy items Belen Curcio 2017-01-25 08:38:03 -03:00
  • c1d3cdce77 deprecating items Belen Curcio 2017-01-25 08:11:52 -03:00
  • cebc5f2f45 Adding fragment views Belen Curcio 2017-01-25 07:09:11 -03:00
  • b1848c28e4 Adding Missing Translations Belen Curcio 2017-01-25 07:08:55 -03:00
  • e993330467 Adding fragments 🎉 Belen Curcio 2017-01-25 05:20:34 -03:00
  • e3b183c565 Items cleanup Belen Curcio 2017-01-25 05:15:04 -03:00
  • 373f119ac2 Added more comment sorting Wyatt Johnson 2017-01-24 17:22:29 -07:00
  • eb469df573 Removed debugging tool Wyatt Johnson 2017-01-24 17:08:12 -07:00
  • 26b7d48f1f Comment ordering fixed, banned users can't do anything Wyatt Johnson 2017-01-24 17:06:40 -07:00
  • 79b366f257 Merge pull request #255 from coralproject/translation-fix David Erwin 2017-01-24 18:34:48 -05:00
  • b6d917a22b fixed translation key, enforced moderation setting schema Wyatt Johnson 2017-01-24 16:08:13 -07:00
  • 622afcc80f Merge pull request #254 from coralproject/graphql David Erwin 2017-01-24 18:02:18 -05:00
  • a09c208f58 Merge branch 'master' into graphql David Erwin 2017-01-24 17:56:04 -05:00
  • 2698045e82 Fixed capital Wyatt Johnson 2017-01-24 15:50:37 -07:00
  • 5a2d8c5201 Fixed template tag Wyatt Johnson 2017-01-24 15:40:17 -07:00
  • 9616c50d49 Merge pull request #251 from coralproject/graphql David Erwin 2017-01-24 17:24:11 -05:00
  • 66b0babdde Merge branch 'graphql' of https://github.com/coralproject/talk into graphql David Erwin 2017-01-24 17:17:38 -05:00
  • 9435b627b1 Uppercase more enums in coral-admin David Erwin 2017-01-24 17:17:03 -05:00
  • da7349343e Merged branch graphql into graphql Riley Davis 2017-01-24 15:09:09 -07:00
  • 62ae297887 make sure the app does not break if you don't have react devtools installed Riley Davis 2017-01-24 15:08:38 -07:00
  • d2acffc19c linting! Belen Curcio 2017-01-24 19:07:53 -03:00
  • 054baa0530 çonfig actions not defined Belen Curcio 2017-01-24 19:01:45 -03:00
  • fb791a9df9 merge Belen Curcio 2017-01-24 18:52:37 -03:00
  • ecfb365c24 log Belen Curcio 2017-01-24 18:51:06 -03:00
  • fa300b1c24 Fixes to circle Wyatt Johnson 2017-01-24 14:38:31 -07:00
  • b0acdff34d Merge branch 'graphql' of github.com:coralproject/talk into graphql David Jay 2017-01-24 16:23:27 -05:00
  • 6f44b9cba0 Merge branch 'graphql' of github.com:coralproject/talk into graphql Belen Curcio 2017-01-24 18:23:11 -03:00
  • 7c3f566202 Handling links inside of iframe in via Pym. David Jay 2017-01-24 16:21:49 -05:00
  • 9edf99730d Status Belen Curcio 2017-01-24 18:21:49 -03:00
  • 050e98f157 Fixed report location Wyatt Johnson 2017-01-24 14:12:38 -07:00
  • 5566856542 Merge branch 'graphql' of https://github.com/coralproject/talk into graphql David Erwin 2017-01-24 16:12:13 -05:00
  • 53dd34f406 Updating admin screen for all caps enums David Erwin 2017-01-24 16:11:17 -05:00
  • 9d7b727f08 Settings container Belen Curcio 2017-01-24 18:08:58 -03:00
  • 603854c0be Adjusted tests for circle Wyatt Johnson 2017-01-24 14:06:39 -07:00
  • ce73118f53 Loading history links in parent page. David Jay 2017-01-24 16:04:03 -05:00
  • 2ffecbeeff Removed build step, is already done via postinstall hook Wyatt Johnson 2017-01-24 13:46:53 -07:00
  • 0a5a23c1f3 Added fixes for tests on CI Wyatt Johnson 2017-01-24 13:45:06 -07:00
  • ee9674cd23 Settings stream tab Belen Curcio 2017-01-24 17:27:30 -03:00
  • 9dc57c82d1 Fixes to consts + services Wyatt Johnson 2017-01-24 13:27:22 -07:00
  • 5750758cf1 Error with asset resolver Belen Curcio 2017-01-24 17:27:05 -03:00
  • 88ed6ffe76 Updating logic for returning users to frontend. David Jay 2017-01-24 15:20:27 -05:00
  • aa1f06d1ee Added explicit joinBy to dataLoader reponse Wyatt Johnson 2017-01-24 13:12:51 -07:00
  • cda768d694 Fixer pre/post Wyatt Johnson 2017-01-24 13:10:35 -07:00
  • 33ec0798e9 Uppercase model Belen Curcio 2017-01-24 17:07:23 -03:00
  • eeaefd9656 fixes for cli Wyatt Johnson 2017-01-24 13:01:56 -07:00
  • 3a59a785f8 Uppercased status's Wyatt Johnson 2017-01-24 12:58:20 -07:00
  • 5e9f8eb624 Fixed statuses Wyatt Johnson 2017-01-24 12:42:49 -07:00
  • d921a59858 Hiding bio tooltip when the user has no bio. David Jay 2017-01-24 14:39:46 -05:00
  • 74ced3b2fd Removing display of user ID in settings. David Jay 2017-01-24 14:35:14 -05:00
  • 6e9757ae91 Updating tests to use capitalized admin. David Jay 2017-01-24 14:27:50 -05:00
  • 8b8bef4ea7 Merge branch 'graphql' of github.com:coralproject/talk into graphql David Jay 2017-01-24 14:19:58 -05:00
  • 4b33199f2f Adding signin button to settings page. David Jay 2017-01-24 14:19:20 -05:00
  • 368606befe Fixed yet, another, import Wyatt Johnson 2017-01-24 12:18:32 -07:00
  • 71f219c0c4 Fixed another import Wyatt Johnson 2017-01-24 12:17:06 -07:00
  • 0e27984518 Fixed import Wyatt Johnson 2017-01-24 12:15:11 -07:00