257ecd3328
Merge branch 'master' into fetch-helper
2016-11-29 15:34:30 -07:00
ef172cabfc
Scroll to comment ( #92 )
...
* host pym locally
* host pym. fix some permalink styles
* get url from parent document
* reset copy dialog timeout
* use pym.parentUrl instead of depending on the parent document
* use a simpler method to find the url
* add some horrible setInterval code
* add some awesome polling
* merge master
* bail out of comment look up after 10 seconds
* re-update permalink attrs
* re-add my listeners to article.ejs
* allow for overriding the talk db name in an environment var
2016-11-29 17:19:56 -05:00
a7f94fce83
implement coralApi fetch
2016-11-29 14:44:37 -07:00
8218d0c18e
Merge branch 'master' into bio
2016-11-29 10:36:20 -07:00
a5de52aeb9
merge
2016-11-29 13:57:14 -03:00
86faf504bb
changes
2016-11-29 13:56:26 -03:00
ea2ee68ed6
Test db clear ( #116 )
...
* Adding headers to stream request.
* Switching mongodb when node_env === test.
2016-11-29 11:44:54 -05:00
55afe36e3b
Renaming
2016-11-29 06:24:13 -03:00
29f378b863
Merge branch 'master' into bio
2016-11-28 17:20:58 -07:00
0e3cd001e9
merge master
2016-11-28 16:38:25 -07:00
d5ff0f8f28
keep it DRY. add getInit all over the place. update tests
2016-11-28 16:18:19 -07:00
7cf05bbdca
Merge branch 'master' of https://github.com/coralproject/talk into settings-in-stream
2016-11-28 17:25:07 -05:00
823c223cf1
Adding settings to redux store from stream.
2016-11-28 17:11:37 -05:00
613a165325
merge
2016-11-28 17:40:22 -03:00
67d9bc2e3a
Disable selection
2016-11-28 17:36:35 -03:00
31b0453e82
Merge branch 'master' into logout
2016-11-28 12:33:42 -08:00
25d53116f7
remove unused var
2016-11-28 12:49:29 -07:00
d384a69111
Main Tabs
2016-11-28 15:56:14 -03:00
0d7014f77a
add helpers to talk-adapter
2016-11-28 11:50:25 -07:00
98c6ef5162
Merge branch 'master' into config-auth-fix
2016-11-28 11:30:28 -07:00
b0f01cf00f
Initial commit of asset queuing ( #97 )
...
* Initial commit of asset queuing
* Addresssing comments
2016-11-28 13:29:39 -05:00
ee0e0ea9ed
import belen's fetch helpers
2016-11-28 11:17:41 -07:00
c0eb202858
small refactor on items actions
2016-11-28 10:57:15 -07:00
1dc7db9081
Structure
2016-11-28 14:43:43 -03:00
5bb386e16a
Structure
2016-11-28 14:25:30 -03:00
4d916be170
Working tabs
2016-11-27 20:54:41 -03:00
3ebdca33f3
Logout func
2016-11-27 19:37:17 -03:00
e5c02c4274
The field is action_type and not action.
2016-11-22 17:14:24 -08:00
6e6ba89706
Hiding reply box on post.
2016-11-22 16:51:22 -05:00
dea62d8895
Fixing bug with reply author name.
2016-11-22 16:16:10 -05:00
0d4a029529
Merge pull request #87 from coralproject/add-https-to-script
...
Adds https and accessibility to embed code.
2016-11-22 16:13:53 -05:00
d04812fd36
Adding https and accessability to embed code.
2016-11-22 16:09:36 -05:00
1eb2d04136
Icon was missing
2016-11-22 12:35:43 -08:00
2e54a51678
Merge branch 'master' into user-integration
2016-11-22 12:09:29 -05:00
8eacb01484
Added fixes for prod
2016-11-22 09:31:54 -07:00
5c532dab5e
Merge branch 'master' of https://github.com/coralproject/talk into user-integration
2016-11-22 11:11:52 -05:00
00a8c59c96
Merge branch 'master' into admin
2016-11-22 08:31:21 -07:00
8108ca09ef
Permissions, views and somestyling
2016-11-22 11:04:56 -03:00
c8d7585e90
Added FabButton to CoralUI
2016-11-22 09:34:46 -03:00
6e6681a553
Styles and refactor errors
2016-11-22 09:08:08 -03:00
f7daa35c41
Active Routes
2016-11-22 08:32:26 -03:00
b74a1bece3
Link Routes
2016-11-22 08:10:46 -03:00
1931c85d67
Merging
2016-11-21 19:23:29 -05:00
06686105c4
Merge branch 'master' into connect-reset-to-fe
2016-11-21 19:06:04 -05:00
2b9caf8daf
Updating frontend to utilize new action delete endpoint.
2016-11-21 18:00:50 -05:00
1a648ca20e
Simplifying item references in CommentStream.
2016-11-21 17:12:55 -05:00
c6b1e5a800
Adding frontend IDs to facilitate management of actions.
2016-11-21 16:54:01 -05:00
fa190b4b3e
CoralLogo added to Coral-UI as SVG. and Admin session
2016-11-21 18:30:12 -03:00
9afc9640ee
Merge branch 'user-integration' of https://github.com/coralproject/talk into notification-room
2016-11-21 16:26:22 -05:00
56205aee74
Expanding dialog box for signin.
2016-11-21 16:19:27 -05:00
Riley Davis