nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8723 commits 4 branches 0 tags 121 MiB
Commit graph

2335 commits

Author SHA1 Message Date
Maxwell Salzberg
6f20e11a67 better invite emails wip 2011-08-19 12:15:11 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
ecf38305b4 added a visible style for missing translations in development and production modes 2011-08-19 11:05:48 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3bcb9c962 Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"" 
This reverts commit a407f12463.
 2011-08-18 16:48:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a407f12463 Revert "Merge branch 'issue1586-aspectdropdown-when-posting'" 
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
 2011-08-18 16:16:14 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
064ae972b3 the cucumber is now passing & renamed the partial to conform with convention 2011-08-18 15:38:27 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b1e95def4a Merge branch 'master' into issue1586-aspectdropdown-when-posting 2011-08-18 12:59:00 -07:00
danielgrippi
eb8c540ac1 MS DG IZ major invite refactor. all tests are green minus weird stuff on dans computer, need to checkout this out on pivots 2011-08-17 16:28:21 -07:00
Brian Wisti
b87c7bb489 Improve code block support 2011-08-16 21:48:48 -07:00
Raphael Sofaer
cc3eeac98e Merge the aspect dropdown in the publisher with master, some things are still broken 2011-08-16 14:59:53 -07:00
Raphael Sofaer
140268365c Simplify aspect dropdown views 2011-08-16 12:43:08 -07:00
danielgrippi
32ae21a213 removed user invite counter, as it was already depricated 2011-08-15 15:15:43 -07:00
Luke Snyder
b62801bd64 Initial styling and links 2011-08-14 22:10:56 -04:00
Raphael Sofaer
a2f7fed8f4 Fix syntax error in WSR, move tipsy from views into stream.js, fix stream element delete tipsy. 2011-08-14 17:45:50 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
3f1e8f0b6e added the check for open invitations 2011-08-14 16:06:25 -07:00
Andrej Kacian
8dc1b70621 Use tipsy for post scope tooltip 2011-08-15 00:54:27 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
ba11bb6d89 you are now able to invite friends from the mobile site 2011-08-14 15:40:07 -07:00
Andrej Kacian
657a9f96ef Fix error when accessing a tag page without being signed in. 2011-08-14 23:51:53 +02:00
Andrej Kacian
4fe61892e1 Added list of followed tags also to tags view, as suggested in issue #1632 2011-08-14 21:34:56 +02:00
Raphael Sofaer
f60ce932b1 Localize string 2011-08-13 09:44:40 -07:00
Raphael Sofaer
f0583de36c Some optimizations to ServicesController#finder. Apparently setting an association on an unsaved record to an empty array hits the database. 2011-08-13 09:40:31 -07:00
Andrej Kacian
b85df7303b After opening a conversation, remove its unread message count from inbox 2011-08-13 05:27:54 +02:00
danielgrippi
75f3accd37 moved facebook friend inviter/finder into contacts layout & re-added search 2011-08-12 17:05:01 -07:00
danielgrippi
a8d37fb3fc Move Facebook inviter view into the contacts layout, rather than a facebox 2011-08-12 17:05:01 -07:00
danielgrippi
7b85dcec9c dg rs; seed bob with facebook friends & fixed invitation view 2011-08-12 17:05:00 -07:00
Andrej Kacian
2f3e504811 Add tooltip to aspect edit icon in aspect listings 2011-08-12 22:15:03 +02:00
Andrej Kacian
1062cc5bf6 Fix contact count displayed on the right for good. Also use only one randomization when selecting the random contacts to display. 2011-08-12 22:04:53 +02:00
danielgrippi
7e901d0220 remove shapado 2011-08-12 11:12:30 -07:00
danielgrippi
7df883eaf0 added summary text per user on stats 2011-08-11 18:52:31 -07:00
danielgrippi
673397508f added segments to stats 2011-08-11 18:34:26 -07:00
Raphael Sofaer
56fc409a39 Most of the way towards getting posts feature working 2011-08-11 18:15:18 -07:00
danielgrippi
76b34ec75d remove 500 2011-08-11 18:01:39 -07:00
danielgrippi
5c6441f6db add basic graph to stats view 2011-08-11 17:58:57 -07:00
danielgrippi
2d9b9270cb go off of yesterday's stats (full day comparison) 2011-08-11 17:27:20 -07:00
danielgrippi
190332308b started on the real stats page 2011-08-11 17:15:33 -07:00
Raphael Sofaer
e2b16ab16f Correct my own spelling mistake 2011-08-11 17:10:49 -07:00
Raphael Sofaer
9a77d3518f Mobile authorizations index view 2011-08-11 16:39:39 -07:00
Raphael Sofaer
c5726bb379 Don't show a hide post button to non-logged in users 2011-08-11 15:50:09 -07:00
danielgrippi
08f12ee348 fixed the 'a post' bug in notification emails 2011-08-11 14:40:45 -07:00
Andrej Kacian
55daaf2b6c Make tag unfollow icon slightly larger and add a helpful tooltip to it 2011-08-11 23:33:59 +02:00
ticho
d63251e6a8 Merge pull request #1703 from ticho/fix-right-bar-target-contact-count 
Show correct contact count in right bar when changing target aspect.
 2011-08-11 14:09:34 -07:00
Dan Hansen
2e9040e227 merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less 2011-08-10 23:57:33 -07:00
danielgrippi
db645e8da8 merged publics/show and posts/show 2011-08-10 18:07:38 -07:00
Raphael Sofaer
091cdd6f94 Basic contacts index page on the mobile site 2011-08-10 16:23:33 -07:00
danielgrippi
1e7a2f327b use post_message in all mailer html views 2011-08-10 15:31:39 -07:00
Raphael Sofaer
e1dd1e2876 Make the devise password views work for mobile users, they're terrible but they display 2011-08-10 12:29:25 -07:00
danielgrippi
118d3720c4 added view for activitystreams public post 2011-08-10 11:24:51 -07:00
Raphael Sofaer
938b633c67 Don't check for what aspects you sent somebody else's posts to 2011-08-10 11:23:11 -07:00
Raphael Sofaer
cd0fca8462 Don't call aspects_with_post more than once, we can find a prettier place to cache it later 2011-08-10 10:38:11 -07:00
Manuel Schölling
ccecf32f9b Show aspect title if message is posted only to one aspect 2011-08-10 10:38:10 -07:00
Manuel Schölling
cc3702d733 Added the number of aspects a message is posted to next to the 'limited' text 2011-08-10 10:38:10 -07:00
Maxwell Salzberg
2d6a69cdc8 fix for 500s in liked emails for reshares and activity streams photos 2011-08-10 10:25:43 -07:00
Maxwell Salzberg
d22e5e7598 make some getting started text slightly cleaner 2011-08-10 09:38:54 -07:00
Sarah Mei
0b02653f44 Merge pull request #1694 from ticho/tag-list-has-unfollow-icon 
Add a "unfollow" icon to each tag in followed tags listing
 2011-08-09 21:44:21 -07:00
Raphael Sofaer
902edb6745 Make the tag autocomplete on the getting started page less broken 2011-08-09 18:55:34 -07:00
Maxwell Salzberg
1afc3f36f5 refix services in getting started 2011-08-09 18:04:44 -07:00
Maxwell Salzberg
7b1ff4cd7b more mobile site compatability. edit profile now is a switch hitter, adding flash to the signup form 2011-08-09 18:02:50 -07:00
Maxwell Salzberg
da51259f32 update dates on some views, give the accept invite form some padding 2011-08-09 18:02:50 -07:00
Raphael Sofaer
3c4f6527ec Don't render the back-to-top link on the landing page 2011-08-09 16:55:22 -07:00
Maxwell Salzberg
86e374b8ce add hovercards back to mentions, reorganized some helpers, made getting started view mobile accessible 2011-08-09 16:54:24 -07:00
Raphael Sofaer
09ac50aaac Let html photo view render for phones, get rid of duplicate host-meta view 2011-08-09 15:36:59 -07:00
Maxwell Salzberg
5a966c93b4 make inviter emails format agnostic 2011-08-09 14:49:17 -07:00
Andrej Kacian
2a970145c8 Added icon to directly unfollow a tag to listing of followed tags. 2011-08-09 22:45:06 +02:00
Maxwell Salzberg
72b734e3e8 scroll to top like a boss 2011-08-09 01:04:54 -07:00
Maxwell Salzberg
43bd8b6860 typo in the settings 2011-08-08 19:07:38 -07:00
Raphael Sofaer
97660e8f49 Fix some typos in the batch invitation email 2011-08-08 19:02:07 -07:00
Maxwell Salzberg
ee08d3cd5c fix inviter a touch 2011-08-08 18:50:59 -07:00
Raphael Sofaer
f02b1dd3a2 Adjust and tweak batch invitation email. It might need a few more tables 2011-08-08 17:56:20 -07:00
Maxwell Salzberg
77cb93be24 fix up the inviter sidebar 2011-08-08 17:53:04 -07:00
Maxwell Salzberg
5bd9e7c53d update email copy 2011-08-08 16:35:34 -07:00
Sarah Mei
ccf843b486 Merge pull request #1745 from ticho/unread-message-count-css-fix 
Correctly space unread and total message counts in conversations list
 2011-08-07 20:40:53 -07:00
Manuel Schölling
8b99ae9cb6 Changed translation and fixed misspelled function call 2011-08-07 22:00:23 +02:00
Manuel Schölling
79d0dfc7bb added missing hang=>left and people's AspectMembershipDropdown is not a partial anymore 2011-08-07 12:53:22 +02:00
Raphael Sofaer
08ae8d23cc aspect_membership_dropdown, not aspectmembership 2011-08-07 12:53:22 +02:00
Manuel Schölling
fead6032f7 Issue 1586: added a aspect drop down next to the submit button in the publisher 2011-08-07 12:51:32 +02:00
Andrej Kacian
6b64d7f55a Correctly space unread and total message counts in conversations list 2011-08-07 04:06:26 +02:00
Andrej Kacian
077d8fd2fe Fixes #1587 by changing globe icon tooltip when switching between public and limited post in publisher. 2011-08-06 23:37:21 +02:00
Sarah Mei
66bb686f4b Handle the case where the pod doesn't have the diasporahq user. 2011-08-06 12:48:23 -07:00
Raphael Sofaer
e3d0cfedd7 Use 'Welcome' from i18n 2011-08-05 23:09:00 -07:00
Raphael Sofaer
de3f27f8b1 We don't need to check defined? on an instance variable 2011-08-05 23:04:30 -07:00
Raphael Sofaer
dde4b30180 Fix rspec specs 2011-08-05 22:29:27 -07:00
Maxwell Salzberg
c5d2dbfa95 add copy 2011-08-05 18:54:49 -07:00
Maxwell Salzberg
b4d4499299 adding invite email 2011-08-05 18:32:25 -07:00
Maxwell Salzberg
a3104741c5 cleanup inviter for more offical email 2011-08-05 17:55:56 -07:00
Raphael Sofaer
a35356cfc3 DG Fix 500 in person page when incoming_request is undefined 2011-08-05 17:33:10 -07:00
danielgrippi
5e1d1428d0 fix styles 2011-08-05 17:29:57 -07:00
danielgrippi
eb6d4c0228 remove dropdown from h4 2011-08-05 17:24:54 -07:00
danielgrippi
cd62064846 touched up aspect/edit and friend finder popups 2011-08-05 17:14:07 -07:00
danielgrippi
0cceb4fdd3 fixed people/contacts layout; pulled person sub-header into its own partial 2011-08-05 15:51:18 -07:00
Raphael Sofaer
5eadc7d41c Fix the last broken jasmine spec by restoring the #no_posts div 2011-08-05 15:09:16 -07:00
danielgrippi
75c3107035 made signing up and accepting an invitation look a little nicer 2011-08-05 12:36:53 -07:00
Raphael Sofaer
c38c744156 Fix contact search in the facebook friend finder. 
It was looking for #contact_list_search instead of .contact_list_search.
 2011-08-05 12:34:48 -07:00
Raphael Sofaer
9e007f2b11 Actually add the facebook inviter partial 2011-08-05 11:55:00 -07:00
Raphael Sofaer
6d3da0d0d1 Memoize the facebook invitation form on the facebook finder page 2011-08-05 11:31:45 -07:00
Daniel Grippi
f63ba2c557 Merge pull request #1707 from TheLambdaCalculus/b1696-publisher-should-automatically-collapse-if-last-photo-removed-and-otherwise-blank 
Issue #1696 - When the last photo is deleted from the publisher, we now collapse the publisher if no status text had been entered.
 2011-08-05 10:57:33 -07:00
Daniel Grippi
a0cdf6869c Merge pull request #1732 from ticho/no-posts-message-outside-of-stream 
Move no_posts_message rendering above the stream
 2011-08-05 10:28:00 -07:00
Maxwell Salzberg
ab74c6fd6b attempt #2. sorry to the mailing list, we will get this fixed soon 2011-08-05 10:07:08 -07:00
Maxwell Salzberg
5d41c14e74 attempt to fix build 2011-08-05 09:44:35 -07:00
Andrej Kacian
2134fd2bc0 Move no_posts_message rendering above the stream, so that it doesn't get pushed down by new posts. 2011-08-04 21:45:22 +02:00
danielgrippi
6a56e3298c only show connect to services if all services not already connected 2011-08-03 19:02:54 -07:00
Maxwell Salzberg
001d4ceaff fix friend finder styling 2011-08-03 18:55:26 -07:00