Tom Moor
|
7bad7a2567
|
Google Analytics tracking on SSR pages
|
2017-11-09 00:01:02 -08:00 |
Jori Lallo
|
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 |
|
Jori Lallo
|
59ab8f5d10
|
Merge pull request #386 from jorilallo/jori/css
CSS fixes
|
2017-11-07 23:29:50 -08:00 |
|
Jori Lallo
|
56c79e1e3b
|
tweaked button styles
|
2017-11-07 23:29:04 -08:00 |
|
Jori Lallo
|
9516bea171
|
rm
|
2017-11-07 23:17:20 -08:00 |
|
Jori Lallo
|
5c47f9b5d1
|
Added zooming image and max width fix
|
2017-11-07 23:10:02 -08:00 |
|
Jori Lallo
|
01af3e8c36
|
CSS fixes
|
2017-11-07 22:02:07 -08:00 |
|
Jori Lallo
|
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 |
|
Jori Lallo
|
826a03c819
|
Fix to to sidebar active state
|
2017-10-31 22:29:25 -07:00 |
|
Jori Lallo
|
53cda8ce2b
|
Merge pull request #374 from jorilallo/jori/colorpicker
Color picker
|
2017-10-31 22:04:09 -07:00 |
|
Jori Lallo
|
c991b85c8d
|
removed additional .js
|
2017-10-31 21:59:14 -07:00 |
|
Jori Lallo
|
980ad792c5
|
addressed comments
|
2017-10-31 21:55:46 -07:00 |
|
Jori Lallo
|
b7b63b844b
|
Merge pull request #375 from jorilallo/jori/sidebar-link-tweaks
Adjusted margins in the sidebar
|
2017-10-31 21:37:29 -07:00 |
|
Jori Lallo
|
d24ddbbf79
|
margins/paddings
|
2017-10-31 21:35:17 -07:00 |
|
Jori Lallo
|
a6e567ed0c
|
Merge pull request #379 from jorilallo/collection-selection
Fixes: Collection selection state
|
2017-10-31 21:20:27 -07:00 |
|
Tom Moor
|
4564d9dbd1
|
Merge pull request #378 from jorilallo/issue-363
Fixes #363
|
2017-10-31 18:31:37 -07:00 |
|
Tom Moor
|
05dedbd616
|
Merge branch 'master' into issue-363
|
2017-10-31 18:24:36 -07:00 |
|
Tom Moor
|
79f6d3b3ec
|
Pass location to trigger rerender. This is advised by react-router docs
|
2017-10-31 18:24:00 -07:00 |
|
Tom Moor
|
507251cfe4
|
Fixing collection selection
|
2017-10-31 00:03:17 -07:00 |
|
Jori Lallo
|
3ebb9e4118
|
Merge pull request #376 from jorilallo/jori/s3-prefix
Prefix s3 user uploads with `uploads/`
|
2017-10-30 23:02:06 -07:00 |
|
Jori Lallo
|
66f3740758
|
Merge branch 'master' into jori/s3-prefix
|
2017-10-30 23:02:01 -07:00 |
|
Jori Lallo
|
c9fc880137
|
include user id in the uploads path
|
2017-10-30 22:35:30 -07:00 |
|
Jori Lallo
|
b63bfb2315
|
Merge pull request #377 from jorilallo/jori/readme-patch-1
README updates
|
2017-10-30 22:28:06 -07:00 |
|
Jori Lallo
|
b97497460b
|
nits
|
2017-10-30 22:24:51 -07:00 |
|
Tom Moor
|
1eea2af80d
|
Fixes #363
|
2017-10-30 21:45:37 -07:00 |
|
Jori Lallo
|
317214ce13
|
SEQUELIZE_SECRET changes
|
2017-10-30 00:26:45 -07:00 |
|
Jori Lallo
|
bcd10584a8
|
Updates to README
|
2017-10-30 00:23:22 -07:00 |
|
Jori Lallo
|
8b4f8f46a4
|
Update README.md
|
2017-10-30 00:13:05 -07:00 |
|
Jori Lallo
|
27fd10f2a6
|
Prefix s3 user uploads with `uploads/`
|
2017-10-29 23:52:09 -07:00 |
|
Jori Lallo
|
bcf002151d
|
Adjusted margins in the sidebar
|
2017-10-29 23:43:02 -07:00 |
|
Jori Lallo
|
148cf8ad33
|
lint
|
2017-10-29 23:28:45 -07:00 |
|
Jori Lallo
|
fe9965093c
|
Moved folders
|
2017-10-29 23:27:06 -07:00 |
|
Jori Lallo
|
e70a8c2495
|
color editing
|
2017-10-29 23:23:16 -07:00 |
|
Jori Lallo
|
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 |
|
Tom Moor
|
87e8b6d207
|
Refactor base styles
|
2017-10-29 15:33:00 -07:00 |
|
Tom Moor
|
84c82c31a9
|
Shared assets, cleanup for initial deploy
|
2017-10-29 15:02:24 -07:00 |
|
Tom Moor
|
e370676b49
|
Homepage skeleton
|
2017-10-26 23:02:45 -07:00 |
|
Tom Moor
|
fc45d6a180
|
Sharing global styles
|
2017-10-26 22:42:08 -07:00 |
|
Tom Moor
|
4863680d86
|
frontend > app
|
2017-10-25 22:49:04 -07:00 |
|
Tom Moor
|
aa34db8318
|
Merge branch 'master' of github.com:jorilallo/atlas into tom/static
|
2017-10-25 22:48:28 -07:00 |
|
Jori Lallo
|
a5d95fd753
|
Merge pull request #311 from jorilallo/toc
TOC
|
2017-10-24 23:00:44 -07:00 |
|
Jori Lallo
|
9e4386da1a
|
Merge branch 'master' into toc
|
2017-10-24 22:58:20 -07:00 |
|
Jori Lallo
|
6ec8384698
|
Merge pull request #349 from jorilallo/code-highlighting
Improve code highlighting
|
2017-10-24 22:34:46 -07:00 |
|
Jori Lallo
|
96a64a36e0
|
Merge pull request #366 from jorilallo/jori/rm-dnd
Fixes to document drag&drop
|
2017-10-24 11:39:30 -07:00 |
|
Jori Lallo
|
2eb8df2559
|
Merge branch 'master' into jori/rm-dnd
|
2017-10-24 11:39:22 -07:00 |
|
Jori Lallo
|
4c6b26b57a
|
Merge pull request #365 from jorilallo/jori/anchor-style
Anchor style
|
2017-10-24 09:44:45 -07:00 |
|
Tom Moor
|
8a3b4429d4
|
Dont merge on github
|
2017-10-24 08:49:33 -07:00 |
|
Tom Moor
|
4f7e5b8122
|
Merge branch 'master' into toc
|
2017-10-24 08:46:48 -07:00 |
|
Tom Moor
|
23c95f4d56
|
Fixes: JS error when no heading
Fixes: Reduce hover zone
Fixes: Add H1s into TOC
|
2017-10-24 08:43:35 -07:00 |
|
Tom Moor
|
8683df3013
|
Merge branch 'master' into jori/anchor-style
|
2017-10-24 08:00:24 -07:00 |