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

4686 commits

Author SHA1 Message Date
Maxwell Salzberg
eb99b6ba5d MS IZ removed the puts 2011-08-23 14:41:16 -07:00
Maxwell Salzberg
2a5155fd4d IZ MS fixed facebook inviter for people you are already friends with to use the normal aspect membership dropdown, and created some nuiaces in the seed script between bob, alice and eve and their fb status" 2011-08-23 13:50:03 -07:00
Maxwell Salzberg
0dc5807ee0 go to the facebook friend finding page on getting started untill we work out the facebox problems 2011-08-23 09:15:51 -07:00
Maxwell Salzberg
e7071fd74c fix admin inviter 2011-08-23 08:43:42 -07:00
Gonzalo Rodriguez
43d6acd868 Support green login page flash message for password change success 2011-08-23 00:51:00 -03:00
Dan Hansen
6b040c7b4a clean up websocket receiver, add specs to content updater 2011-08-22 20:03:38 -05:00
MrZYX
87cd09a936 fix string concat 2011-08-22 23:09:51 +02:00
Dan Hansen
c0f45acfe8 Merge branch 'js-refactor-merged' 2011-08-21 21:40:01 -05:00
Sarah Mei
db6acebb6c Need to define mailer_name in the mailer wrapper class, or devise can't find the email templates. 
Also, for some reason, had to move the include of NotifierHelper to the view itself. That requires more investigation.
 2011-08-21 19:11:46 -07:00
Dan Hansen
4a64a172d1 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	spec/javascripts/stream-spec.js
 2011-08-21 20:57:01 -05:00
Dan Hansen
545611fffa green? 2011-08-21 20:45:51 -05:00
Andrej Kacian
cad14bcdfc Show tags on user profile pages for everyone if we're logged in. 2011-08-22 01:59:03 +02:00
Andrej Kacian
50f32ce5ac Show ajax loader and hide the hide icon when hiding a post. 2011-08-22 00:38:34 +02:00
Luke Snyder
f9fc55823b finished styling 2011-08-21 13:07:04 -04:00
Luke Snyder
96bfaf7550 changes to bar 2011-08-21 12:24:31 -04:00
Dan Hansen
3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js
 2011-08-20 14:40:56 -05:00
Gonzalo Rodriguez
f1cf81772b Closes #1386. On conversations, disable Reply button once pressed 2011-08-20 15:51:39 -03:00
Gonzalo Rodriguez
ceedbb14cb Closes #1486. Profile update was crashing with invalid birthday date 2011-08-20 00:34:59 -03:00
Raphael Sofaer
a74080e27d Fix ServicesController spec 2011-08-19 16:52:26 -07:00
Maxwell Salzberg
735a37ffe0 really basic preventivie mesures for facebook friending. we need to GO ALL THE WAY and proxy facebook users to be in many aspects 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
bb5ada6533 create a wrapper class for devise mailer, both so we can resquify it and so we can inject helpers 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
e4062bf5fd now functionally correct 2011-08-19 15:56:32 -07:00
Maxwell Salzberg
70fe2cf10f wip 2011-08-19 15:56:31 -07:00
Maxwell Salzberg
e100032244 add all in the query, to be more pedantic 2011-08-19 13:59:41 -07:00
Maxwell Salzberg
3cee589397 show only invites from a user 2011-08-19 13:58:22 -07:00
Maxwell Salzberg
fe78a69161 combine invitation emails 2011-08-19 12:15:11 -07:00
Maxwell Salzberg
6f20e11a67 better invite emails wip 2011-08-19 12:15:11 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
96d183a041 fixed private message emails not including the message 2011-08-19 11:33:55 -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
Gonzalo Rodriguez
3d7297ba5e Closes #1753. Render thats_you message instead of dropdown for your hovercard 2011-08-19 00:47:26 -03:00
Maxwell Salzberg
6beeecefd8 add better messages telling a user that they sent share requests if they try and email exsisting users 2011-08-18 18:27:37 -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
2777f16f4f Merge branch 'issue1586-aspectdropdown-when-posting' 2011-08-18 16:02:09 -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
Maxwell Salzberg
7d9b1636c0 dont raise runtime error if invitation token is not found 2011-08-18 14:14:24 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b1e95def4a Merge branch 'master' into issue1586-aspectdropdown-when-posting 2011-08-18 12:59:00 -07:00
Raphael Sofaer
c7331230bc Revert "Revert "Revert "remove uploaded test images after running the specs/cucumber"" -- using == now instead of =" 
This reverts commit b11bd23da2.
 2011-08-18 12:06:04 -07:00
danielgrippi
b11bd23da2 Revert "Revert "remove uploaded test images after running the specs/cucumber"" -- using == now instead of = 
This reverts commit 7969b52035.
 2011-08-18 11:20:49 -07:00
Maxwell Salzberg
0473037d1b fix notification links 2011-08-18 11:12:58 -07:00
danielgrippi
7969b52035 Revert "remove uploaded test images after running the specs/cucumber" 
This reverts commit a6eb275c7a.
 2011-08-18 11:11:08 -07:00
danielgrippi
a6eb275c7a remove uploaded test images after running the specs/cucumber 2011-08-18 11:08:57 -07:00
Gonzalo Rodriguez
2d54d9a97e Validate presence of message text on conversations. Closes #1329. 2011-08-17 23:52:31 -03:00
Raphael Sofaer
8231ce2239 Don't log big xml things 2011-08-17 18:59:25 -07:00
danielgrippi
a99e69edd6 down to 2 failures in postgres 2011-08-17 16:51:54 -07:00
Maxwell Salzberg
ad1b122e20 test batch_invite 2011-08-17 16:28:21 -07:00
Maxwell Salzberg
e0fb8a08cb set the user email if inviting by email 2011-08-17 16:28:21 -07:00
Maxwell Salzberg
4ed684491d MS RS fix view params from invitations#new 2011-08-17 16:28:21 -07:00
Maxwell Salzberg
19eb549889 fixed up update controller action and building users #scary #gladsofaerisstillhere 2011-08-17 16:28:21 -07:00
Maxwell Salzberg
e039aabeef senders must now own aspects 2011-08-17 16:28:21 -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
Maxwell Salzberg
cc6618d294 some progress 2011-08-17 16:28:21 -07:00
danielgrippi
159fce3ef2 refactor wip 2011-08-17 16:28:21 -07:00
danielgrippi
bf0eb3dac3 4 failures left in postgres 2011-08-17 14:18:51 -07:00
Brian Wisti
736b179888 Turn on all the redcarpet options 2011-08-16 21:48:48 -07:00
Brian Wisti
b87c7bb489 Improve code block support 2011-08-16 21:48:48 -07:00
Brian Wisti
03127cd592 basic support for Redcarpet Markdown 2011-08-16 21:48:48 -07:00
Raphael Sofaer
89639edb3a Use the Contact#in_aspect? helper in aspect_membership_dropdown 2011-08-16 15:01: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
Maxwell Salzberg
a06f25b297 Merge pull request #1763 from grzuy/conversation-creation-refactor 
Refactor conversations creation
 2011-08-16 10:26:54 -07:00
danielgrippi
511517b3c7 cleaned up and documented Invitation. moved an action into a User before_create callback 2011-08-15 16:44:37 -07:00
danielgrippi
32ae21a213 removed user invite counter, as it was already depricated 2011-08-15 15:15:43 -07:00
danielgrippi
669cd8578e scoped invite_user_by_email job into Mail module 2011-08-15 12:35:32 -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
3a18044821 Fix infinite scroll on search... some kind of weird thing with rails responding with json even when request.format is html, with a mime type of html 2011-08-13 09:59:17 -07: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
Gonzalo Rodriguez
2326206586 Refactor conversations creation 2011-08-12 23:07:01 -03:00
danielgrippi
1c5f61fb78 dropdown images as embedded assets and not 2 separate image tags 2011-08-12 18:18:58 -07:00
Raphael Sofaer
565d71a0cd Bad solution for making sure that an invited facebook user is marked immediately as having been invited 2011-08-12 17:32:52 -07: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
Raphael Sofaer
38a8962945 Fix 500 on photo destroy 2011-08-12 15:58:42 -07:00
Raphael Sofaer
3831c13a4a Move the app/models/jobs folder to match the name of the module 2011-08-12 15:56:26 -07:00
Raphael Sofaer
8b743e7e3b Fix stack level too deep error on reshares 2011-08-12 13:20:25 -07:00
Raphael Sofaer
31b55aef0b Start saving the usernames of facebook users 2011-08-12 13:20:25 -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
Raphael Sofaer
3c34749dd7 Put a select limit on the person query on contactsController index, since we know exactly what we're doing with the data 2011-08-12 10:13:29 -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
7f69714d08 Fix paul.elicker link, refactor people_helper 2011-08-11 16:26:14 -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
Raphael Sofaer
d9904ecd30 InvitationsController update has an error, and our non-specific error catching is messing up knowing what our problems are 2011-08-11 14:50:43 -07:00
Raphael Sofaer
78a637f251 Take out useless line in Reshare#receive 2011-08-11 14:42:44 -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
Raphael Sofaer
7900f291e4 Try to get rid of the googlebot error on posts/show 2011-08-11 14:26:01 -07: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
Raphael Sofaer
3594d3ba8b Fix error raising in message after_receive 2011-08-11 14:01:27 -07:00
Raphael Sofaer
0b00616b8c Create appConfig option for following diasporahq 2011-08-11 12:01:14 -07:00
Raphael Sofaer
7021cd79c8 Select distinct people in contacts index 2011-08-11 11:56:23 -07:00
Raphael Sofaer
a2043671ce Move comment email subject line code into models 2011-08-11 10:46:15 -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
90a5cd2254 Get rid of error on aspect_memberships destroy if someone has noscript on or something 2011-08-10 17:40:38 -07:00
Raphael Sofaer
8086b9a9d4 Eliminate 500 errors on also_commented emails, the copy there is terrible 2011-08-10 16:58:35 -07:00
Raphael Sofaer
350a4b4f6d Fix 500 on invitations new on unknown facebook user... bad solution, maybe we should just delete the offending invitations? 2011-08-10 16:42:08 -07:00
Raphael Sofaer
091cdd6f94 Basic contacts index page on the mobile site 2011-08-10 16:23:33 -07:00
Raphael Sofaer
3658481c38 Fix errors when trying to mail comment notifications to post authors on posts other than status messages 2011-08-10 15:40:32 -07:00
danielgrippi
b6c26611ef placed all mail jobs in the Job::Mail:: namespace & added into appropriate folders 2011-08-10 15:31:40 -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
a2bfc4a487 Limit the length of some log statements 2011-08-10 10:56:23 -07:00
danielgrippi
aa3d626ada validate instead of throwing a db error 2011-08-10 10:38:28 -07:00
Raphael Sofaer
f51b71b7db Fix NotifierHelper 2011-08-10 10:38: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
4bff560a30 add helper file 2011-08-10 10:27:34 -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
Maxwell Salzberg
47d5ea7a83 remove weird whitespace bug 2011-08-09 19:14:49 -07:00
Maxwell Salzberg
4fb4f71169 prevent duplicate services from being created 2011-08-09 19:01:38 -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
7ae6ca201b revert a fix for the profile flash 2011-08-09 18:32:27 -07:00
Maxwell Salzberg
054c897820 authentication required on the token show page because it 500s if you are not logged in 2011-08-09 18:10:27 -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
f8e53bfba5 Fix a user's atom feed route from a cell phone. 2011-08-09 16:20:27 -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
Raphael Sofaer
015879a96a Move the unserialized_attribute override into the youtube_titles module. 2011-08-09 14:23:50 -07:00
Raphael Sofaer
a4e54a7b05 Protect ourselves from problems with youtube title serialization by rescuing type mismatches in the marshaller. 2011-08-09 14:04:31 -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
e9d993b8f6 throw 404s when the person is no found 2011-08-09 13:03:45 -07:00
Raphael Sofaer
69619f9ba2 Rescue from duplicate key errors in AspectMembershipsController 2011-08-09 12:50:24 -07:00
Raphael Sofaer
7f5f696642 Don't let googlebot 500 us on the public post page 2011-08-09 12:26:10 -07:00
danielgrippi
a78fa96e99 don't display a reshare link if the original post has been deleted 2011-08-09 10:26:21 -07: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
Raphael Sofaer
f385eef851 Fix like socketing 2011-08-08 11:54:32 -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
Raphael Sofaer
201574c53a Check for nil before building ServiceUser objects 2011-08-06 14:02:27 -07:00
Sarah Mei
66bb686f4b Handle the case where the pod doesn't have the diasporahq user. 2011-08-06 12:48:23 -07:00
Sarah Mei
421bfe6d8f Handle the case in which the pod owner has not set up featured users. 2011-08-06 12:47:46 -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
817d6701e4 We don't have fakes anymore, get rid of most of the reshare? method 2011-08-05 22:31:32 -07:00
Raphael Sofaer
dde4b30180 Fix rspec specs 2011-08-05 22:29:27 -07:00
Maxwell Salzberg
700927e40f remove user stubbing 2011-08-05 18:59:04 -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
Raphael Sofaer
8b7f938a63 Order the results of ServicesController#finder 2011-08-05 16:42:09 -07:00
Maxwell Salzberg
1facf2fccb fix passing public link for services links 2011-08-05 16:35:25 -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
c7360fe6ce Document contact.sharing and receiving a little 2011-08-05 15:25:26 -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
Raphael Sofaer
0d864935cd Make reshares helper a little more readable 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
danielgrippi
b11c1a899f add invitations partial back, removed set_invites (yay) 2011-08-03 18:47:06 -07:00
danielgrippi
134e8a1b20 limit RSS rel link in layout to person pages 2011-08-03 18:30:25 -07:00
danielgrippi
9b24af717f fix styling on featured users on getting started; added hovercards 2011-08-03 18:22:52 -07:00
Maxwell Salzberg
520b0dcf33 only show resend link 2011-08-03 18:18:00 -07:00
Maxwell Salzberg
275be550f8 aspects is not an li 2011-08-03 18:14:49 -07:00
danielgrippi
99ac976594 fix redirects around getting_started and aspect/index 2011-08-03 18:07:43 -07:00
danielgrippi
987d334764 fixed tests, translations, initalizer 2011-08-03 18:02:58 -07:00
danielgrippi
23c2eaf1c5 added a real profile description on the welcome tab 2011-08-03 18:02:58 -07:00
danielgrippi
7d01deb99d don't show connect to cubbies in right bar if user is already connected 2011-08-03 18:02:58 -07:00
danielgrippi
e23439d193 fix cucumber; temporarily remove fetch featured users initilizer 2011-08-03 18:02:57 -07:00
danielgrippi
984eef25be UsersHelper -> GettingStartedHelper 2011-08-03 18:02:57 -07:00
danielgrippi
e589dd88b2 added has_connected_cubbies? 2011-08-03 18:02:57 -07:00
danielgrippi
120cf9835b added more translations; welcome text switch 2011-08-03 18:02:57 -07:00
danielgrippi
b8b4ad3d84 added helpers for each of the getting started steps; make step sections dull if completed 2011-08-03 18:02:56 -07:00
danielgrippi
303b23883d added featured users, left nav, and search boxes into getting started 2011-08-03 18:02:56 -07:00
danielgrippi
d51e495925 fetch featured users from remote servers on app init unless already in the db 2011-08-03 18:02:56 -07:00
danielgrippi
6369eefdbe added translations to getting started 2011-08-03 18:02:56 -07:00
danielgrippi
c9eeeb6150 ms dg; profile (step 1) finished 2011-08-03 18:02:56 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c2dc5fde08 dg iz reworked the getting started into a tab, need to remove the getting started steps 2011-08-03 18:02:56 -07:00
Maxwell Salzberg
1ae7b80c56 some tweaks for friend finder styling 2011-08-03 18:00:38 -07:00
Raphael Sofaer
f1040a237f Put the new_aspect class on the notification page aspect dropdown, so that the focus js is triggered 2011-08-03 17:47:52 -07:00
Maxwell Salzberg
099d882814 fix aspect dropdown when friend on diaspora 2011-08-03 17:38:30 -07:00
Maxwell Salzberg
62f10c5b3c add help 2011-08-03 17:25:04 -07:00
Maxwell Salzberg
7e8f17cc31 refactoring this stuff 2011-08-03 16:58:55 -07:00
Raphael Sofaer
1aac60bee3 Make sure that not deleting the service_users doesn't leave them stale 2011-08-03 15:39:23 -07:00
Raphael Sofaer
7d0c796762 Make sure that related data for fb users is attached to them 2011-08-03 15:30:58 -07:00
Raphael Sofaer
4d786d687c Forget about postgres for now, depend on On duplicate key update 2011-08-03 14:39:38 -07:00
Raphael Sofaer
a8104da482 Strip exif in the scaling process 2011-08-03 14:34:54 -07:00
Raphael Sofaer
0fff54e074 We pass in nil as a size to person_image_tag, so we need to default it more forcibly. 2011-08-03 13:45:45 -07:00
Raphael Sofaer
67123a277c Fix and simplify likes_container 2011-08-03 11:20:06 -07:00
Raphael Sofaer
5967f01dab Take out PostsFake, now that we ajax in comments it's not worth the extra complications 2011-08-03 11:09:21 -07:00
Maxwell Salzberg
9cbb6c4d5e you know, i should uncomment code before i commit it 2011-08-02 22:30:24 -07:00
Maxwell Salzberg
11ad3f2b78 silly hack to preventdefault tags from getting generated... 2011-08-02 22:28:40 -07:00
danielgrippi
25e4f5d0ae dg ms; made no posts text on person show more explicit 2011-08-02 12:53:36 -07:00
Raphael Sofaer
a542bb7a6d Take comments out of the photo show page, they were broken anyway. 2011-08-02 11:10:42 -07:00
Raphael Sofaer
be5453f0b4 Fix photo show pages with likes 2011-08-02 10:17:49 -07:00
Raphael Sofaer
406ab7a073 Delete a stray file, some cleanup 2011-08-02 09:47:17 -07:00
Raphael Sofaer
674ca883e5 Put class back into remote person_links 2011-08-01 18:25:31 -07:00
Raphael Sofaer
a469f09c01 Fix hovercard conflict with vanity urls 2011-08-01 18:22:29 -07:00
Raphael Sofaer
d7ac6c4713 Link the no_tags text to a tag page, we should make tags#index something meaningful one day. 2011-08-01 17:59:19 -07:00
danielgrippi
6daf7f5ad9 add prompt to add more contacts if user has less than 2 contacts on aspect index 2011-08-01 15:31:13 -07:00
danielgrippi
756a20ecd4 link a user to featured users if user has zero contacts 2011-08-01 15:19:51 -07:00
Raphael Sofaer
983d4e5598 Hopefully make youtube_titles a little less ridiculous 2011-08-01 12:30:21 -07:00
Maxwell Salzberg
773f207b17 fix the viewport for real this time. sorry about all of the emails 2011-07-31 21:57:26 -07:00
Maxwell Salzberg
2fb2cd0a80 fix mobile viewport for mobile site 2011-07-31 21:33:43 -07:00
Gaelan D'costa
ba98043412 Issue #1126 - When the last photo is deleted from the publisher, we now collapse the publisher if no status text had been entered. 2011-07-31 19:29:01 -04:00
Andrej Kacian
78c3d91abd Show correct contact count in right bar when changing target aspect. 2011-07-31 12:29:56 +02:00
Gonzalo Rodriguez
3eb6d13f95 Issue #1431: Suggest when the first letter typed, not the third 2011-07-30 15:56:28 -03:00
Maxwell Salzberg
bb8db654d6 add basic pod error logging, and added guard and removed autotest 2011-07-30 11:44:27 -07:00
Maxwell Salzberg
bbf8f2a15b for tests, only try to connect with an actual person 2011-07-29 21:52:46 -07:00
danielgrippi
7504f66416 thumb small on comments 2011-07-29 19:34:50 -07:00
danielgrippi
91461ab2ad fix tag duplication; photo sizes 2011-07-29 19:31:06 -07:00
Maxwell Salzberg
315ec29af2 typo in my link 2011-07-29 19:30:12 -07:00
danielgrippi
9037748d23 fixed search 2011-07-29 19:21:18 -07:00
danielgrippi
905a982d35 add two more default aspects for new users 2011-07-29 19:21:18 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
3a6f0583c7 added featured users dg iz 2011-07-29 19:00:15 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e42d7273a8 featured users section 2011-07-29 19:00:15 -07:00
Maxwell Salzberg
d55a21c458 just kidding. totally going to namespace users 2011-07-29 18:53:46 -07:00
Maxwell Salzberg
d407be036e i am not a number! include username in the main url of a local user! 2011-07-29 18:53:46 -07:00
Maxwell Salzberg
540a3e68a6 remove an unused query, randomize the contacts on your home page 2011-07-29 18:53:46 -07:00
Maxwell Salzberg
73616a3e7a new users now autofollow diasporahq@joindiaspora.com; upon connecting to a user, you now get post visibilities for their public posts (that your pod knows about) 2011-07-29 17:20:10 -07:00
Maxwell Salzberg
a320891df0 sample users so they are random, not the same all the time 2011-07-29 17:16:37 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
fd27fdc204 fix facebox not closing when adding a contact to an aspect via the dropdown menu 2011-07-29 15:06:24 -07:00
Raphael Sofaer
b8df1dca5c remove pretty print 2011-07-29 14:56:06 -07:00
danielgrippi
e345f2dcbc fix contacts index page 2011-07-29 14:15:28 -07:00
danielgrippi
2b550906fc downcase query string for search 2011-07-29 14:05:59 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
16bd3e4c2f less delay on search; start on 2 chars instead of 3 2011-07-29 12:26:04 -07:00
danielgrippi
f560321626 optimized people search 2011-07-29 12:04:10 -07:00
Raphael Sofaer
5e39368414 Get rid of 500 on mobile comment creation 2011-07-29 12:01:35 -07:00
Raphael Sofaer
6946d28243 Fix the build for socketing of comments.haml 2011-07-29 11:50:50 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e17fe1848f removed unused file 2011-07-29 11:39:41 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
00571b84cd completed donate option 2011-07-29 11:33:30 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7327c882b2 the working button in diaspora 2011-07-29 11:33:29 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
24fed68247 added the buttons 2011-07-29 11:33:29 -07:00
Raphael Sofaer
cac6d048f8 Fix mobile views of reshares 2011-07-29 11:21:13 -07:00
Maxwell Salzberg
7a43a812bf show comment form for post show pages 2011-07-29 10:10:22 -07:00
Maxwell Salzberg
b2bce9e1b2 update jquery mobile to beta1 2011-07-28 23:32:41 -07:00
danielgrippi
68dafdbf0d correct contact count on aspect/index 2011-07-28 16:23:31 -07:00
Raphael Sofaer
8ce5e72519 Use data-aspect_id, because integer html ids freak me out. 2011-07-28 15:51:00 -07:00
danielgrippi
ee95def580 removed js from the view. added grabbing hand while moving aspects 2011-07-28 15:34:01 -07:00
danielgrippi
dfa5824dc1 remove repeated link, fixed cucumber 2011-07-28 14:52:09 -07:00
Raphael Sofaer
87d0f9d6fd Merge branch 'master' of github.com:diaspora/diaspora 2011-07-28 14:42:02 -07:00
Raphael Sofaer
b367a486d3 Add helper clone to aspect sorting js, so that dragging doesn't click 2011-07-28 14:41:19 -07:00
Raphael Sofaer
ddd4424df8 Merge remote branch 'manuels/842-sortable-aspects' 
Conflicts:
	app/models/user.rb
	db/schema.rb
 2011-07-28 14:36:41 -07:00
danielgrippi
6e25a6a0f1 touched up reshare view 2011-07-28 13:46:16 -07:00
Raphael Sofaer
37bb641227 Merge branch 'master' of github.com:diaspora/diaspora 2011-07-28 13:03:06 -07:00
Dennis Schubert
bbf28f9072 That fixes the mobile-interface for now 2011-07-28 21:45:42 +02:00
Raphael Sofaer
4fa5731d5e Merge remote branch 'jancborchardt/1410-messages-conversation' 
Conflicts:
	app/views/conversations/new.haml
 2011-07-28 12:45:40 -07:00
Raphael Sofaer
192ae3a52b Merge remote branch 'ticho/followed-tag-listing-separate-file' 2011-07-28 12:33:14 -07:00
Raphael Sofaer
d043c74528 Merge remote branch 'ticho/highlight-unread-conversations' 2011-07-28 12:17:39 -07:00
Ryan Hughes
2a187ae770 Likes don't return 500 errors. 2011-07-27 23:26:54 -07:00
Raphael Sofaer
4a1bd27728 Merge pull request #1677 from ticho/conversations-send-button-action-string-fix 
Use "Sending..." instead of "Posting..." for new conversation.
 2011-07-27 17:54:35 -07:00
Raphael Sofaer
6406de89ee Merge remote branch 'gandaro/1602-delete-profile-photo' 2011-07-27 17:19:47 -07:00
Andrej Kacian
e4a81fbc8a Use "Sending..." instead of "Posting..." for new conversation. 2011-07-27 23:09:05 +02:00
Andrej Kacian
cb828ae9d4 Merge branch 'master' of git://github.com/diaspora/diaspora into highlight-unread-conversations 2011-07-27 22:50:59 +02:00
MrZYX
99751af5a8 let the direction_for helper return ltr instead of nothing for ltr text, this should fix #1668 2011-07-27 22:34:41 +02:00
Andrej Kacian
cc3ba8b076 Display unread post count for conversations in inbox, if appropriate. 2011-07-27 22:33:13 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7b572bf40b don't display connect to services unless services are configured on that pod 2011-07-27 00:11:24 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
73f9627338 moved invite people to the top 2011-07-26 23:31:42 -07:00
Andrej Kacian
77a654ef47 Updated copyright year in new file 2011-07-26 19:11:02 +02:00
Andrej Kacian
2dd09cfaa2 Updated to fit current upstream master 2011-07-26 19:11:02 +02:00