mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
932 Commits 83 Branches 44 Tags 172 MiB
2cda489a89
Commit Graph

932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrew Brown
10aa25882a Only show serendipitous cards if a user is signed in and owns the content they're looking at 2016-09-26 01:28:11 +02:00
Robert Richter
98bd3c0356
Use Concern version of Serendipitous 2016-09-24 18:40:29 -05:00
Andrew Brown
8e754587b5 Merge pull request #49 from indentlabs/polish-ui 
Polish ui
 2016-09-24 03:00:40 +02:00
Andrew Brown
aa6ac445fd Allow updating privacy field on content 2016-09-24 02:55:48 +02:00
Andrew Brown
bb32f61799 Avoid 500s when all fields on content are filled already 2016-09-24 02:40:12 +02:00
Andrew Brown
6d68184ec1 Better utilize whitespace on content#show pages 2016-09-24 01:36:50 +02:00
Andrew Brown
7616906f71 Merge branch 'master' into polish-ui 
Conflicts:
	app/views/content/form/_actions_dropdown.html.erb
 2016-09-24 01:32:05 +02:00
Andrew Brown
191d35e706 Merge pull request #40 from indentlabs/issue-10 
Make edit button open the same tab (fixes #10)
 2016-09-23 23:44:28 +02:00
Andrew Brown
2978c38102 Replace sharing toggles with an info message for content visitors 2016-09-23 23:33:11 +02:00
Andrew Brown
9983de1a29 Adjust publicly_shared? logic to account for legacy nil privacy values 2016-09-23 23:25:32 +02:00
Andrew Brown
3e0fbd9eb2 Merge branch 'master' into issue-10 
Conflicts:
	app/assets/javascripts/content.js.coffee
 2016-09-23 23:14:50 +02:00
Andrew Brown
c46b8bdcc6 Remove placeholder in dropdown 2016-09-23 23:11:45 +02:00
Andrew Brown
acd0ddea3b Merge pull request #41 from indentlabs/issue-15 
Make content shareable
 2016-09-23 23:05:10 +02:00
Andrew Brown
c0d645c79f Merge branch 'master' into issue-15 2016-09-23 22:58:35 +02:00
Andrew Brown
e97d44ecb1 Merge pull request #43 from indentlabs/add-gravatars 
Add user profile images
 2016-09-23 22:58:14 +02:00