Commit Graph

4221 Commits

Author SHA1 Message Date
Robert Richter
5e5534a829
Merge branch 'master' into issue-10 2016-09-22 16:48:20 -05:00
Robert Richter
aa46434f09
Make is_public scopes use new OR logic 2016-09-22 16:47:40 -05:00
Robert Richter
80822def57
Merge branch 'master' into issue-15 2016-09-22 16:08:53 -05:00
Andrew Brown
06656c9d70 Merge pull request #42 from indentlabs/add-editorconfig
Add editorconfig file
2016-09-22 23:06:58 +02:00
Robert Richter
7cae32a3e9
Add privacy to items and locations 2016-09-22 16:06:21 -05:00
Andrew Brown
d856cb98d4 Merge branch 'master' into add-editorconfig 2016-09-22 23:03:10 +02:00
Robert Richter
8706cf9109
Change is_public logic
Previously, Universe privacy was checked first. If it was private, then
any content within it was private. If it was public, only then would
the content's privacy be checked.

Now, both values are checked in an OR comparison. If either the universe
or content privacy is "public," then the content is public.
2016-09-22 15:30:56 -05:00
Robert Richter
e305714192
Compensate for tab anchor scrolling page 2016-09-22 13:29:14 -05:00
Robert Richter
bb9edc1377
Merge branch 'master' into issue-15 2016-09-22 13:15:56 -05:00
Robert Richter
9ae81c40d6
Add a message about image dimensions 2016-09-22 13:11:41 -05:00
Robert Richter
3252962a9f
Clean up share box styles 2016-09-22 13:03:42 -05:00
Robert Richter
2809c3c60a
Add back is_public scope 2016-09-22 13:03:10 -05:00
Robert Richter
bf3cf4a51e
Add HasPrivacy concern 2016-09-22 13:02:03 -05:00
Robert Richter
ad178d7854
Make privacy toggle send "public" or "private" 2016-09-22 11:33:58 -05:00
Robert Richter
4184366e32
Fix typo 2016-09-22 11:05:17 -05:00
Robert Richter
75455a3a62
Add links to users profile image 2016-09-22 11:03:39 -05:00
Robert Richter
0823d2e026
Merge branch 'master' into add-gravatars 2016-09-22 10:28:59 -05:00
Andrew Brown
f6329456eb Merge pull request #45 from indentlabs/landing-page-redesign
Add more benefits to landing page
2016-09-22 16:23:18 +02:00
Andrew Brown
1e4b9e93a9 Merge branch 'master' into landing-page-redesign 2016-09-22 16:19:42 +02:00
Andrew Brown
bfb77ec249 Add more benefits 2016-09-22 16:14:59 +02:00
Andrew Brown
5113f0e1fc Merge pull request #44 from indentlabs/landing-page-redesign
Landing page redesign
2016-09-22 05:43:52 +02:00
Andrew Brown
95fd2cf6bd Merge branch 'master' into landing-page-redesign
Conflicts:
	app/views/main/index.html.erb
2016-09-22 05:39:41 +02:00
Andrew Brown
a9d35a45d9 Add footer and promo code to signup form 2016-09-22 05:35:08 +02:00
Andrew Brown
f837c4fce4 Link through to signup page 2016-09-22 05:16:48 +02:00
Andrew Brown
1823695816 Normalize card intro assets to the same size 2016-09-22 05:12:31 +02:00
Andrew Brown
989628085f landing page content 2016-09-22 05:03:53 +02:00
Robert Richter
f86c910812
Make all images for user metadata 120px 2016-09-21 21:16:58 -05:00
Robert Richter
96fb62e758
Display user image to their profile page 2016-09-21 21:13:30 -05:00
Robert Richter
59e4ca8164
Allow specifying a size for user image 2016-09-21 21:11:09 -05:00
Robert Richter
6475d52a56
Add a default name to users 2016-09-21 21:08:59 -05:00
Robert Richter
801a5fd55f
Add user avatar to User page metadata 2016-09-21 20:37:44 -05:00
Robert Richter
d34b99f9ea
Make Gravatars identicons by default 2016-09-21 20:35:03 -05:00
Robert Richter
f17891b14d
Add image_url property to User 2016-09-21 20:21:52 -05:00
Andrew Brown
3b4208f389 Merge pull request #12 from indentlabs/issue-6-seo
Add SEO data
2016-09-22 02:43:04 +02:00
Robert Richter
eb27424323
Create editorconfig file 2016-09-21 12:07:12 -05:00
Robert Richter
911f1f2ed0
Update website domain name in analytics 2016-09-21 11:53:29 -05:00
Robert Richter
b8449a16eb
Add user-specific meta tags to User profile 2016-09-21 11:50:00 -05:00
Robert Richter
0487cc09b2
Extract blacklisted User attributes into a method 2016-09-21 11:44:08 -05:00
Robert Richter
67a3cfa3b7
Move description and keywords into layout 2016-09-21 11:35:37 -05:00
Robert Richter
37a5898b65
Add meta info to privacy policy 2016-09-21 11:30:10 -05:00
Robert Richter
961dc903fc
Add newline to end of file 2016-09-21 11:29:04 -05:00
Robert Richter
a7441a3b9a
Restructured meta tags 2016-09-21 11:13:44 -05:00
Andrew Brown
2b18b1b789 Way better landing page, still wip 2016-09-21 04:23:00 +02:00
Robert Richter
e8dc289ff8
Restructure meta tags for content 2016-09-20 18:32:08 -05:00
Robert Richter
f18404290a
Write a universes integration test 2016-09-20 18:31:26 -05:00
Robert Richter
286d06c60e
Add share buttons and wire them up 2016-09-20 17:09:43 -05:00
Robert Richter
d80f6f9596
Improve character test descriptions 2016-09-20 13:11:05 -05:00
Robert Richter
9218e97441
Add privacy field to Character 2016-09-20 13:08:41 -05:00
Robert Richter
a0ffdc5ee8
Create "Share" modal dialog
Can only be opened by calling `$('#share-modal').openModal()`
2016-09-20 11:08:34 -05:00
Robert Richter
3f891d6067
Make edit button open the same tab (fixes #10) 2016-09-20 09:20:36 -05:00