Commit Graph

947 Commits

Author SHA1 Message Date
Andrew Brown
58992ae0a3 Merge pull request #70 from indentlabs/feature/68-favicon
Add favicons
2016-10-01 15:30:24 +02:00
Robert Richter
6239205e95
Add favicons 2016-09-30 18:40:04 -05:00
Andrew Brown
80cb68afa1 Merge pull request #67 from indentlabs/add-mit-license
Add mit license
2016-09-30 19:30:08 +02:00
Andrew Brown
a4cc0b2029 Merge branch 'master' into add-mit-license 2016-09-30 19:25:05 +02:00
Andrew Brown
8f6f2ebc5f Remove bug that slipped in too #yolo 2016-09-30 19:07:48 +02:00
Andrew Brown
8eeef22bc2 Add MIT license 2016-09-30 18:53:56 +02:00
Andrew Brown
546735e262 Merge pull request #66 from indentlabs/reenable-dashboard-card
Re-enable dashboard serendipitous card
2016-09-30 13:15:26 +02:00
Andrew Brown
ae0a04c2a1 Re-enable dashboard serendipitous card 2016-09-30 12:32:34 +02:00
Andrew Brown
cc8d6dc41a Merge pull request #65 from indentlabs/dont-ask-about-relations
temporarily disable seren card on dashboard
2016-09-30 04:29:43 +02:00
Andrew Brown
62ecf10a00 Merge branch 'master' into dont-ask-about-relations 2016-09-30 04:26:46 +02:00
Andrew Brown
10377a66d8 temporarily disable seren card on dashboard 2016-09-30 04:25:39 +02:00
Andrew Brown
c78b903806 Merge pull request #64 from indentlabs/dont-ask-about-relations
Only show serendipitous card if we have a i18n question associated wi…
2016-09-30 04:22:46 +02:00
Andrew Brown
aefe1d4774 comment out relations from serendip card 2016-09-30 04:18:40 +02:00
Andrew Brown
9e2c0ff90e Don't ask about birthplace until we can do location linking in serendipitous 2016-09-30 04:15:00 +02:00
Andrew Brown
39e3a71572 Only show serendipitous card if we have a i18n question associated with the field 2016-09-30 04:11:25 +02:00
Andrew Brown
2cda489a89 Merge pull request #50 from indentlabs/issue-18-serendipitous-i18n
Internationalize Serendipitous
2016-09-30 03:46:41 +02:00
Andrew Brown
07b5b99b5e Merge branch 'master' into issue-18-serendipitous-i18n 2016-09-30 03:44:30 +02:00
Robert Richter
794c38d656
Serendipitous PR was merged, use master 2016-09-29 20:42:09 -05:00
Robert Richter
03193cea5e
Merge branch 'master' into issue-18-serendipitous-i18n 2016-09-29 20:16:09 -05:00
Robert Richter
3bf3f8412b
Fix merge conflict 2016-09-29 20:08:24 -05:00
Robert Richter
4ee0d5f008
Merge master 2016-09-29 20:06:41 -05:00
Andrew Brown
b17d321e02 Merge pull request #63 from indentlabs/polish-ui
Only show edit links on content list to owner
2016-09-30 02:38:44 +02:00
Andrew Brown
aa446939a6 Merge branch 'master' into polish-ui 2016-09-30 02:36:51 +02:00
Andrew Brown
8ca219c605 Only show edit links on content list to owner 2016-09-30 02:33:15 +02:00
Andrew Brown
41f3a4863e Merge pull request #61 from indentlabs/slack-stats
Report new author signups to slack #analytics channel
2016-09-30 02:26:05 +02:00
Andrew Brown
6efa18ecf8 Merge branch 'master' into slack-stats
Conflicts:
	app/views/devise/registrations/new.html.erb
2016-09-30 02:23:01 +02:00
Andrew Brown
6a94cdf4dc Merge pull request #59 from indentlabs/polish-ui
Final pre-launch polishing
2016-09-30 02:16:47 +02:00
Andrew Brown
50a4626c66 Report new author signups to slackgit status! 2016-09-30 00:32:07 +02:00
Andrew Brown
b8496e9dc7 Fix skintone test 2016-09-29 21:40:30 +02:00
Andrew Brown
96be59d85b dashboard, footer, and misc polish 2016-09-29 21:35:43 +02:00
Andrew Brown
258a9b23fb sidebar polish 2016-09-29 20:04:44 +02:00
Andrew Brown
dd6c8789bf Content show page polish / autocomplete hooks 2016-09-29 19:57:42 +02:00
Andrew Brown
321f382999 navbar polish for mobile responsiveness 2016-09-29 17:54:39 +02:00
Andrew Brown
c89a7625cf content show page polish 2016-09-29 17:31:18 +02:00
Andrew Brown
3125a56d72 password reset page polish 2016-09-29 17:17:51 +02:00
Andrew Brown
586d5c5500 login page polish 2016-09-29 17:15:22 +02:00
Andrew Brown
af866fc64b sign up page polish 2016-09-29 17:12:11 +02:00
Andrew Brown
425deb71ab privacy policy polish 2016-09-29 17:08:59 +02:00
Andrew Brown
f49f793771 Edit user page styling/polish 2016-09-29 17:06:46 +02:00
Andrew Brown
6cfa555da0 Author profile page polish 2016-09-29 16:57:53 +02:00
Andrew Brown
cf33c18c7c Content index page polishes 2016-09-29 16:28:18 +02:00
Andrew Brown
ff5314732f Content show/edit pages polish 2016-09-29 15:58:30 +02:00
Andrew Brown
b4c2dc1cb3 Dashboard polish 2016-09-29 14:58:42 +02:00
Andrew Brown
3d2e6df7da Merge pull request #58 from indentlabs/graphs-everywhere
Graphs everywhere
2016-09-29 01:12:27 +02:00
Andrew Brown
689d755de2 Fix graphs 2016-09-29 00:57:27 +02:00
Andrew Brown
7c0b7b7b90 take datetimes out of card tables for focus on content 2016-09-29 00:49:38 +02:00
Andrew Brown
96393e75ef Add the rest of the graphs 2016-09-29 00:29:10 +02:00
Andrew Brown
061f0aef37 Add admin stat pages for users, characters, locations, items, and universes 2016-09-28 23:39:32 +02:00
Robert Richter
d82b0a2282
Update git version of Serendipitous 2016-09-25 19:40:05 -05:00
Andrew Brown
65d00abf74 Merge pull request #53 from indentlabs/issues/51
Only show serendipitous cards if a user is signed in and owns the content they're looking at
2016-09-26 01:55:54 +02:00