Commit Graph

1064 Commits

Author SHA1 Message Date
6c1996d79b Update favicon 2017-11-09 23:20:29 -08:00
5cccd11d7b Added favicon, social tags to SSR pages 2017-11-09 23:14:03 -08:00
45137721d4 Merge pull request #391 from jorilallo/readme
Update README.md
2017-11-09 10:34:22 -08:00
524d514682 Update README.md 2017-11-09 08:31:52 -08:00
4a7e581cf2 Merge pull request #389 from jorilallo/ga
Google Analytics
2017-11-09 00:50:03 -08:00
2f9a65c0a0 Merge pull request #390 from jorilallo/jori/rename-atlas
Renamed Atlas to Outline
2017-11-09 00:48:49 -08:00
f5c51a96f0 Renamed Atlas to Outline 2017-11-09 00:20:22 -08:00
b08e34d578 Insert ga tags in app 2017-11-09 00:17:55 -08:00
12d20611d6 Update README.md 2017-11-09 00:03:41 -08:00
7bad7a2567 Google Analytics tracking on SSR pages 2017-11-09 00:01:02 -08:00
3efc9af9e7 Merge pull request #388 from jorilallo/block-insert
New block insert toolbar
2017-11-08 23:50:20 -08:00
b5dad27b4a 👕 2017-11-08 23:21:32 -08:00
e98caf6e51 Final polish 2017-11-08 23:19:26 -08:00
5d716d9c5f 99% there 2017-11-08 00:08:35 -08:00
5588826691 Merge pull request #387 from jorilallo/jori/zoomable-image
Added zooming image and max width fix
2017-11-07 23:35:05 -08:00
59ab8f5d10 Merge pull request #386 from jorilallo/jori/css
CSS fixes
2017-11-07 23:29:50 -08:00
56c79e1e3b tweaked button styles 2017-11-07 23:29:04 -08:00
9516bea171 rm 2017-11-07 23:17:20 -08:00
5c47f9b5d1 Added zooming image and max width fix 2017-11-07 23:10:02 -08:00
01af3e8c36 CSS fixes 2017-11-07 22:02:07 -08:00
51bc705488 Working 2017-11-05 22:48:31 -08:00
a725a4bbf6 Merge pull request #380 from jorilallo/jori/fix-sidebar-active
Fix to to sidebar active state
2017-10-31 22:31:56 -07:00
826a03c819 Fix to to sidebar active state 2017-10-31 22:29:25 -07:00
14326d89f2 WIP 2017-10-31 22:25:42 -07:00
53cda8ce2b Merge pull request #374 from jorilallo/jori/colorpicker
Color picker
2017-10-31 22:04:09 -07:00
c991b85c8d removed additional .js 2017-10-31 21:59:14 -07:00
980ad792c5 addressed comments 2017-10-31 21:55:46 -07:00
b7b63b844b Merge pull request #375 from jorilallo/jori/sidebar-link-tweaks
Adjusted margins in the sidebar
2017-10-31 21:37:29 -07:00
d24ddbbf79 margins/paddings 2017-10-31 21:35:17 -07:00
a6e567ed0c Merge pull request #379 from jorilallo/collection-selection
Fixes: Collection selection state
2017-10-31 21:20:27 -07:00
4564d9dbd1 Merge pull request #378 from jorilallo/issue-363
Fixes #363
2017-10-31 18:31:37 -07:00
05dedbd616 Merge branch 'master' into issue-363 2017-10-31 18:24:36 -07:00
79f6d3b3ec Pass location to trigger rerender. This is advised by react-router docs 2017-10-31 18:24:00 -07:00
507251cfe4 Fixing collection selection 2017-10-31 00:03:17 -07:00
3ebb9e4118 Merge pull request #376 from jorilallo/jori/s3-prefix
Prefix s3 user uploads with `uploads/`
2017-10-30 23:02:06 -07:00
66f3740758 Merge branch 'master' into jori/s3-prefix 2017-10-30 23:02:01 -07:00
c9fc880137 include user id in the uploads path 2017-10-30 22:35:30 -07:00
b63bfb2315 Merge pull request #377 from jorilallo/jori/readme-patch-1
README updates
2017-10-30 22:28:06 -07:00
b97497460b nits 2017-10-30 22:24:51 -07:00
1eea2af80d Fixes #363 2017-10-30 21:45:37 -07:00
317214ce13 SEQUELIZE_SECRET changes 2017-10-30 00:26:45 -07:00
bcd10584a8 Updates to README 2017-10-30 00:23:22 -07:00
8b4f8f46a4 Update README.md 2017-10-30 00:13:05 -07:00
27fd10f2a6 Prefix s3 user uploads with uploads/ 2017-10-29 23:52:09 -07:00
bcf002151d Adjusted margins in the sidebar 2017-10-29 23:43:02 -07:00
148cf8ad33 lint 2017-10-29 23:28:45 -07:00
fe9965093c Moved folders 2017-10-29 23:27:06 -07:00
e70a8c2495 color editing 2017-10-29 23:23:16 -07:00
a1bfde7aec Merge pull request #352 from jorilallo/tom/static
[WIP] Content pages server side rendered in React
2017-10-29 16:35:33 -07:00
87e8b6d207 Refactor base styles 2017-10-29 15:33:00 -07:00