Commit Graph

1961 Commits

Author SHA1 Message Date
Belen Curcio 8920a59a92 ádding dev back 2016-11-08 18:25:54 -03:00
Belen Curcio ce31161ef9 Production webpack 2016-11-08 18:22:27 -03:00
Belen Curcio cba476edfe removing watch adding webpack const for env vars 2016-11-08 17:49:48 -03:00
Belen Curcio 86350800c2 Merge branch 'master' of github.com:coralproject/talk into community 2016-11-08 17:43:00 -03:00
Belen Curcio a36524a55f merge 2016-11-08 17:21:12 -03:00
David Erwin 661b402351 Remove npm install from coral-admin build 2016-11-08 14:53:28 -05:00
David Erwin 57c63348bd Merge branch 'master' into embed-link 2016-11-08 14:44:18 -05:00
Belen Curcio 130fc259bf Cleanup 2016-11-08 16:36:52 -03:00
Riley Davis c609e5b3bb enable css modules 2016-11-08 12:35:37 -07:00
Belen Curcio b7c0602a2c Header, Drawer, Layout 2016-11-08 16:32:09 -03:00
Belen Curcio b18104c8d9 Layout Container and Route handling 2016-11-08 16:19:53 -03:00
Riley Davis 80f1f70a2a hardcode routes in react app 2016-11-08 12:03:49 -07:00
Belen Curcio ef3a34680a config for pre git 2016-11-08 15:52:09 -03:00
Belen Curcio 1508eac92d Removing divs from routes 2016-11-08 15:51:43 -03:00
Riley Davis a15d2eade7 add ejs templating and serve coral-admin from /admin 2016-11-08 11:15:08 -07:00
David Jay 7e72046481 Adding npm install to build process for coral-admin so build works. 2016-11-08 12:57:16 -05:00
David Jay ee33b8445b Adding embed script to appropriate screen in settings. 2016-11-08 12:56:22 -05:00
David Jay 411e6e48f3 Removing unused copy from build process. 2016-11-08 12:28:09 -05:00
David Erwin 4fcbead158 Merge branch 'master' into one-build 2016-11-08 11:34:59 -05:00
Riley Davis ed509ad36b build from root. routes in coral-admin menu work 2016-11-08 09:13:04 -07:00
David Jay 33c77178a9 Fixing id bug in redux store. 2016-11-07 18:41:23 -05:00
David Jay e7f4f82f66 Fixing comment post order bug. 2016-11-07 18:41:07 -05:00
David Jay 456524e4ee Adding multiline comments. 2016-11-07 18:09:26 -05:00
David Jay 47bcd163b1 Showing comments in chronological order. 2016-11-07 17:56:44 -05:00
David Jay f1f051e63f Copying over files in dev webpack 2016-11-07 17:29:49 -05:00
Riley Davis 686d39c47b merge master 2016-11-07 15:28:20 -07:00
David Jay 4f33818153 Posting items in reverse chronological order. 2016-11-07 17:12:20 -05:00
David Jay c5d15eed77 Fixing bug in reply counting. 2016-11-07 16:54:52 -05:00
David Jay 3bdd1893e0 Commenting out flag button. 2016-11-07 16:48:57 -05:00
David Jay 9c3957ad40 Getting pym via https 2016-11-07 16:47:03 -05:00
David Jay c8bdecbd1b Merge branch 'master' of https://github.com/coralproject/talk into post-comment 2016-11-07 16:29:06 -05:00
Dan Zajdband 018784d725 fix(coral-admin): building, no css 2016-11-07 16:26:49 -05:00
David Jay 4737e84681 Displaying comments and replies appropriately. 2016-11-07 16:11:10 -05:00
David Jay 376d37f05e Removing type dependency when hydrating comments. 2016-11-07 15:44:49 -05:00
David Jay 5a3d6ac287 Adding styling authorname. 2016-11-07 15:40:01 -05:00
David Jay 82f8ed3b4a Adding headers to post function. 2016-11-07 15:39:44 -05:00
David Jay 529a350440 Adding keys to comments. 2016-11-07 15:39:16 -05:00
David Erwin 8685e31b57 Integrating webpack build files, working commit 2016-11-07 15:31:12 -05:00
David Jay e5c04b5fd1 Updating routes and adding dev webpack to package.json 2016-11-07 13:51:40 -05:00
David Jay 3b75445309 Displaying comment author names. 2016-11-07 13:51:10 -05:00
David Jay cb68298171 Adding temporary user name field to commentbox. 2016-11-07 13:39:33 -05:00
David Jay f04e2505ec Adding title to iframe for screen readers. 2016-11-07 13:25:45 -05:00
Dan Zajdband adb2dc2054 fix(coral-admin): updated queue endpoint 2016-11-07 12:21:27 -05:00
Dan Zajdband dfdd8ea6f8 fix(coral-admin): updated config 2016-11-07 12:19:33 -05:00
Dan Zajdband 53af608419 fix(coral-admin): Adapt to the new schema. Most things are not working yet but at least it bundles 2016-11-07 11:57:34 -05:00
David Jay eefa8e3285 Merge branch 'master' into mock-stream-endpoint
# Conflicts:
#	routes/api/index.js
2016-11-03 14:31:51 -07:00
David Jay 46e6508abe Adding action routes
And fixing a few small issues with item posting.
2016-11-03 10:52:16 -07:00
David Jay f50528e50a Updating posting to support new framework 2016-11-03 10:07:01 -07:00
Dan Zajdband 0d4b8ef748 Added coral admin 2016-11-03 11:52:28 +01:00
David Jay 83505417b0 Adding sample article and removing unused log statement 2016-11-02 16:00:43 -07:00