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

1836 commits

Author SHA1 Message Date
Ilya Zhitomirskiy
288d20b6e8 correlations on the admins page 2011-10-11 10:57:26 -07:00
Ilya Zhitomirskiy
4c9b45b9c8 WIP 2011-10-11 10:57:26 -07:00
danielgrippi
818167c565 DG IZ; wip 2011-10-11 10:57:26 -07:00
danielgrippi
882c0c2170 DG MS; fixed tags autocomplete styling and js 2011-10-10 15:59:13 -07:00
Gonzalo Rodriguez
6b5928ca09 Remember last selected aspects through the session 2011-10-09 02:24:53 -02:00
Levente Bagi
43544a7bee fixed tags#show when tag is not found 
Bug introduced by commit 2b22e1dab
 2011-10-08 00:31:53 +01:00
Maxwell Salzberg
2b22e1dab5 make the links on featued users tile be the tag with the name in the link. added a following count to tags 2011-10-07 12:19:28 -07:00
danielgrippi
2baa1e7c6e remove hidden posts from the cache; add unhidden posts to the cache 2011-10-06 19:14:08 -07:00
Your Name
5b9fbd19ed moar specs, a little perf upgrade for base_stream#person 2011-10-06 17:13:04 -07:00
Your Name
55ffc44a42 wip 2011-10-06 17:13:04 -07:00
Maxwell Salzberg
cdce54bbda MS SM featured users stream. because we do what we want 2011-10-05 21:12:02 -07:00
Ilya Zhitomirskiy
2185df3f52 chaged the default order to created_at 2011-10-05 15:17:45 -07:00
Maxwell Salzberg
a3eeb9f3c1 comment on tagged posts wip 2011-10-04 18:20:15 -07:00
Maxwell Salzberg
81e04a11fe fix tag stream, no comments for now, but coming soon 2011-10-03 17:30:22 -07:00
Maxwell Salzberg
34f82d8bc1 try an in query directly for the tags 2011-10-03 17:14:57 -07:00
danielgrippi
1d818fdc23 added reshare to mobile site 2011-10-03 17:02:23 -07:00
Maxwell Salzberg
df023e4c72 small cubbies app scope refactor 2011-10-03 15:23:11 -07:00
Maxwell Salzberg
01fd1f23c7 moving stuff around 2011-10-03 15:23:11 -07:00
Maxwell Salzberg
1d2439ee76 clean up stream directory structure 2011-10-03 15:23:11 -07:00
Maxwell Salzberg
8fa02584c0 fix a bug I introduced 2011-10-03 15:23:11 -07:00
Maxwell Salzberg
9a4c478a7b these spes are really green. too bad we need #moar 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
ad9dcd8542 holy guacamole. mentions page and tag following pages, plus a huge stream refactor 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
429ac42502 added tag follow feature, mention page feature. is now pretty easy to add new types of streams, but some more refactoring could make it even nicer 2011-10-03 15:22:14 -07:00
danielgrippi
9672c27232 using two less delegates in mobilejs; made some partials for mobile stream elements for sanity's sake 2011-10-02 12:27:14 -07:00
Maxwell Salzberg
164b395f06 derp. remove puts-es 2011-10-02 09:37:55 -07:00
Maxwell Salzberg
647bc585cc always remember me on the mobile. make previous helpers shorter 2011-10-02 09:30:05 -07:00
danielgrippi
b881d7b3de default sort order to created_at instead of commented_on on desktop site 2011-10-01 16:24:28 -07:00
danielgrippi
eaa191515e remove logging statement in a before filter that performed a query 2011-09-30 21:11:00 -07:00
Maxwell Salzberg
63c7634f6a Revert "header data as helper methods" 
This reverts commit 607013bc83.
 2011-09-30 14:43:52 -07:00
danielgrippi
607013bc83 header data as helper methods 2011-09-30 13:22:12 -07:00
Maxwell Salzberg
621075d4e1 fix mentioning from profile page spec, add some tests for the ajax_stream? method 2011-09-30 10:54:13 -07:00
John Edmonds
8d0f6699ae Move photo upload logic to file_handler. 2011-09-29 21:49:58 -04:00
Maxwell Salzberg
45491f06d5 fix cuke for inf scroll(dont rely on session for sort order) 2011-09-29 17:33:15 -07:00
Maxwell Salzberg
aa5d5b560d fix incorrect status_message#new view 2011-09-29 15:17:25 -07:00
Maxwell Salzberg
772f69de2d fix typo in statusmessage controller 2011-09-29 14:06:36 -07:00
danielgrippi
e3bf03636b pass in mobile as provider_display_name on posts if posting from mobile 2011-09-28 22:15:32 -07:00
danielgrippi
2b2443b6b9 aspect dropdown takes public and all aspects option 2011-09-27 21:09:27 -07:00
danielgrippi
744ab579bd adding comments work for one of two comment add buttons; added info on 
posts; post show page.
 2011-09-27 21:09:27 -07:00
danielgrippi
ea357a96ef expand&collapse comments; added comment form (wip) 2011-09-27 21:09:27 -07:00
danielgrippi
91c9fffb81 touched up login page wip 2011-09-27 21:09:26 -07:00
danielgrippi
6deb924c32 fixed header; compose message on top right 2011-09-27 21:09:26 -07:00
danielgrippi
ab3d220b57 always sort by created_at on mobile 2011-09-27 21:09:26 -07:00
danielgrippi
8c586c4567 added html5 boilerplate meta tags to mobile; stripped functionality to add back 2011-09-27 21:09:25 -07:00
danielgrippi
4bd1f0997d fix build 2011-09-25 13:14:09 -07:00
danielgrippi
131166841a added logged out page referencing mobile 2011-09-25 11:58:44 -07:00
John Edmonds
b999617dde Respond with HTML for Opera. 
If we don't respond with the content-type text/html, rails will return a 406 Not Acceptable.
 2011-09-25 12:01:44 -04:00
John Edmonds
5f906defc8 Directly use UploadedFile object if available. 
Opera doesn't support XHR file uploads and instead submits a regular form.
Thus, we are provided with an UploadedFile object which can be used instead of creating our own compatible object.
 2011-09-25 11:51:13 -04:00
Maxwell Salzberg
049eb74ab2 added route to grab users profile picture if you know their username 2011-09-24 23:33:14 -07:00
Ilya Zhitomirskiy
461cb22109 in the getting started featured tags are now followable 2011-09-23 17:06:21 -07:00
Ilya Zhitomirskiy
386697f711 added a nil check, for pre-mongo days 2011-09-21 13:37:37 -07:00
Ilya Zhitomirskiy
c98f2d1664 added a weekly user stat for admin 2011-09-21 13:23:09 -07:00
Ilya Zhitomirskiy
ed4b91249d added a publisher to the tag page 2011-09-19 11:38:55 -07:00
Maxwell Salzberg
bc1aef4999 MS IZ start to implement followed tags in the stream 2011-09-16 18:19:34 -07:00
danielgrippi
999efbd451 IZ DG MS; fix method call in public receiver 2011-09-15 19:37:56 -07:00
danielgrippi
60cb9e43a7 DG MS; renamed Salmon jobs; CGI::unescape() incoming xml in public receive route 2011-09-15 15:33:28 -07:00
danielgrippi
97f80272b2 DG MS; changed Job:: to Jobs::; require all mail jobs from Job base class 2011-09-15 12:42:53 -07:00
danielgrippi
ec011f0800 DG MS; optimized local comments to be batched; backfilled more tests 2011-09-15 11:22:47 -07:00
Maxwell Salzberg
60ace5c297 DG MS; Broke out HydraWrapper in HttpMulti job 2011-09-14 15:50:07 -07:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Maxwell Salzberg
3184d7aad1 MS DG clean up Postzord::Dispatcher::Private 2011-09-13 13:32:50 -07:00
The Lambda Calculus
f8f1ef3f91 Refactored code so that the controller got thinner while the model become fatter [Finishes #1126] 2011-09-13 03:04:22 -04:00
Maxwell Salzberg
665facaeb0 DG MS renamed private dispatcher; started refactor including public 
dispatcher
 2011-09-12 17:02:40 -07:00
Maxwell Salzberg
6e60905d0d DG MS major refactor of salmon and corresponding federation logic 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
6b0507949c updated salmon to let us not always encrypt the header 2011-09-12 14:05:31 -07:00
danielgrippi
293afd80ff all_public scope in Post for clarity 2011-09-11 19:28:52 -07:00
danielgrippi
1bd37038cc fixed/moved specs; made Person.all_from_aspects scope (move direct AR querying from AspectStream; added more documentation in AspectStream 2011-09-11 14:16:48 -07:00
danielgrippi
21182c88ec initial tests for AspectStream 2011-09-11 14:16:48 -07:00
danielgrippi
ec4dc7a905 Created AspectStream; removed all logic from AspectsController#index 2011-09-11 14:16:48 -07:00
Sarah Mei
8b789bfe35 Notifications don't 500 anymore, but I don't know how to make it render the mobile view. 2011-09-10 13:38:01 -07:00
danielgrippi
fe915ecb09 don't redirect to AspectsController#new from AspectsController#index if no aspect is present 2011-09-10 09:25:38 -07:00
danielgrippi
36a9e1643e touched up AspectsController#index for readability's sake 2011-09-10 09:24:35 -07:00
Ilya Zhitomirskiy
ad11bd2a31 the Devise email regex was not catching pods that were anything other than a standard url 2011-09-09 18:05:58 -07:00
danielgrippi
1844226077 paginate facebook friends. 2011-09-07 13:00:21 -07:00
Jonne Hass
bc4872d3a5 ensure handle is downcased on search, fix #1912 2011-09-07 15:17:42 +02:00
Gonzalo Rodriguez
4a2b609d53 Join two aspect_ids calculations into one 2011-09-06 23:12:03 -03:00
Gonzalo Rodriguez
8dd05a5e5b Fixing method signature semantics 2011-09-03 03:36:38 -03:00
Gonzalo Rodriguez
0aeab944bf Related to #1885. Workaround to avoid crashing when searching tags with dots like cubbi.es 
What i did was to redirect to the tag without dots, in this case cubbies
I didn't consider a good idea to add route support for /tags/cubbi.es
since it get messed with request formats
 2011-09-03 00:22:27 -03:00
Gonzalo Rodriguez
eae9c14168 Use named helper instead of hardcoded route 2011-09-02 22:49:16 -03:00
Daniel Grippi
00ffc996e4 Merge pull request #1866 from TheLambdaCalculus/b1126-deletion-of-all-photos-from-a-post-with-no-words-should-result-in-the-post-being-deleted 
B1126 deletion of all photos from a post with no words should result in the post being deleted
 2011-09-01 10:04:10 -07:00
vcuculo
8270a486ae dont forget mobile site :) 2011-09-01 09:48:57 +02:00
The Lambda Calculus
9d7b8d7f5d Have passing Cucumber tests [Finishes issue #1126] 2011-09-01 01:59:51 -04:00
The Lambda Calculus
98b71f92ab We now do a check on photo deletion to ensure that any associated status messages are also deleted if now empty [Issue #1126] 2011-09-01 01:59:51 -04:00
Maxwell Salzberg
3bde507a3a DC MS fix crazy status.net linkback accept header 2011-08-29 18:44:31 -07:00
Sarah Mei
b60101b9ad Use explicit parameters instead of request format to determine whether we render a remote or non-remote form in aspects#new. 
Facebox needs to get back a text/html response. We were using text/javascript to indicate that we wanted a remote form and text/html to indicate we wanted a non-remote form. The trouble is, if we request with text/javascript then that is the format we get back. It doesn't really make sense to use formats that way anyway, so I changed it to an explicit parameter. This had the nice side effect of simplifying our new-aspect views.
 2011-08-28 16:08:57 -07:00
Gonzalo Rodriguez
b048d1dd54 When deleting an aspect from contacts page do not redirect to aspects page 2011-08-27 19:24:21 -03:00
Gonzalo Rodriguez
cc1add81b0 Avoid RecordNotFound exception thrown by find method when invalid person_id 2011-08-27 02:45:58 -03:00
Dan Hansen
d084c708b6 use @like.target instead of @target, build should be green 2011-08-26 16:08:39 -05:00
Dan Hansen
27d4fd8176 fix retractions, fix likes, backfill likes widget tests, remove typo from jasmine.yml, remove unneeded js files 
require confirmation for comments in js, get rid of rails helper
 2011-08-26 15:24:07 -05:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2708b0b695 added back the tooltip explaining username constatrains on the accept invite flow 2011-08-24 17:35:27 -07:00
Raphael Sofaer
7f0677ab16 connect wip 2011-08-23 16:37:51 -07:00
Raphael Sofaer
dec10e3de9 Finish setting up sesssions#new prefill when logged out by authorizationsControlelr 2011-08-23 16:37:51 -07:00
Raphael Sofaer
a63d1ad4ae Sign out the signed in user if a different uid is passed to AuthorizationsController#new 2011-08-23 16:37:50 -07:00
Raphael Sofaer
6b88a75174 Log out a user if they arrive at AuthorizationsController#new carrying the username of a different user 2011-08-23 16:37:50 -07:00
danielgrippi
a7d9bbed84 wip 2011-08-23 16:37:50 -07:00
danielgrippi
27049e52b5 connect logic 2011-08-23 16:37:50 -07:00
Maxwell Salzberg
e7071fd74c fix admin inviter 2011-08-23 08:43:42 -07: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
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
6f20e11a67 better invite emails wip 2011-08-19 12:15:11 -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
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
Maxwell Salzberg
0473037d1b fix notification links 2011-08-18 11:12:58 -07:00
Gonzalo Rodriguez
2d54d9a97e Validate presence of message text on conversations. Closes #1329. 2011-08-17 23:52:31 -03:00
Maxwell Salzberg
ad1b122e20 test batch_invite 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
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
danielgrippi
bf0eb3dac3 4 failures left in postgres 2011-08-17 14:18:51 -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
Maxwell Salzberg
a06f25b297 Merge pull request #1763 from grzuy/conversation-creation-refactor 
Refactor conversations creation
 2011-08-16 10:26:54 -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
Ilyaaaaaaaaaaaaa Zhitomirskiy
ba11bb6d89 you are now able to invite friends from the mobile site 2011-08-14 15:40:07 -07: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
Gonzalo Rodriguez
2326206586 Refactor conversations creation 2011-08-12 23:07:01 -03: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
Raphael Sofaer
38a8962945 Fix 500 on photo destroy 2011-08-12 15:58:42 -07: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
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
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
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
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
7021cd79c8 Select distinct people in contacts index 2011-08-11 11:56:23 -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
091cdd6f94 Basic contacts index page on the mobile site 2011-08-10 16:23:33 -07:00
danielgrippi
118d3720c4 added view for activitystreams public post 2011-08-10 11:24:51 -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
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
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
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
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
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
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
b4d4499299 adding invite email 2011-08-05 18:32:25 -07:00
Maxwell Salzberg
1facf2fccb fix passing public link for services links 2011-08-05 16:35:25 -07:00
danielgrippi
b11c1a899f add invitations partial back, removed set_invites (yay) 2011-08-03 18:47:06 -07:00
danielgrippi
99ac976594 fix redirects around getting_started and aspect/index 2011-08-03 18:07:43 -07:00
danielgrippi
e23439d193 fix cucumber; temporarily remove fetch featured users initilizer 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
d51e495925 fetch featured users from remote servers on app init unless already in the db 2011-08-03 18:02:56 -07:00
Maxwell Salzberg
7e8f17cc31 refactoring this stuff 2011-08-03 16:58:55 -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
Andrej Kacian
78c3d91abd Show correct contact count in right bar when changing target aspect. 2011-07-31 12:29:56 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e42d7273a8 featured users section 2011-07-29 19:00:15 -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
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
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
Raphael Sofaer
00885be738 Provide feedback when a user tries to double-reshare 2011-07-22 17:43:05 -07:00
Raphael Sofaer
78bced56bb Reshares and reshare retractions are green. 2011-07-22 16:00:19 -07:00
danielgrippi
a32ef3c1d8 added xml response to the post 2011-07-21 18:22:18 -07:00
danielgrippi
bdc4b9f746 marsharing reshares now grabs the post from the original poster, also fetcheer that person if they don't exist locally still need to ping for xml and give the right xml back 2011-07-21 18:22:18 -07:00
danielgrippi
509a435cc9 moving to not including the post in the reshare xml 2011-07-21 18:22:17 -07:00
danielgrippi
f3a515eef1 DG IZ reshare retractions is WIP 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
fa9269541f wip removed some generated specs 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
06f886ad77 WIP reshare 2011-07-21 18:22:17 -07:00
Raphael Sofaer
e2bdd54dd8 Undo part of the refactor so that StatusMessage validations work. 2011-07-21 17:56:53 -07:00
Raphael Sofaer
caf26a5c64 Upgrade rails.js, add CSRF token manually in the photo uploader. 2011-07-21 17:49:33 -07:00
Raphael Sofaer
20de3a5622 Refactor StatusMessagesController#create, move the photo dispatching into an after_dispatch hook 2011-07-21 16:30:00 -07:00
Raphael Sofaer
8eea37cbdb Fix people socketing 2011-07-21 13:41:46 -07:00
Raphael Sofaer
4de2ca9958 Get websocket pushing posts 2011-07-21 13:21:48 -07:00
Raphael Sofaer
9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change 
Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb
 2011-07-19 10:44:00 -07:00
Dan Hansen
6a11784a2e Rewrote ContactsController#index, thoughts? 2011-07-17 15:44:07 -07:00
Raphael Sofaer
5d64611f2b Include profile in contactsController index for the publisher 2011-07-15 14:49:35 -07:00
Raphael Sofaer
f60a748c21 Ajax in the contacts for mentioning after page load 2011-07-15 14:23:44 -04:00
Raphael Sofaer
874654b461 Reenable sessionscontroller after_filter 2011-07-12 17:01:40 -07:00
danielgrippi
6f807f263a fix the specs; pull back guid in post_visibilities_controller 2011-07-12 15:18:28 -07:00
MrZYX
9304db68f1 fix peoples#aspect_membership_dropdown 2011-07-12 20:04:55 +02:00
Raphael Sofaer
8f50c622fa Fix contentUpdater spec, adjust migration and fix a couple of the js viwes 2011-07-11 16:17:11 -07:00
danielgrippi
d364f158b8 cache counters in for likes. pending Diaspora::Likeable module... 2011-07-11 15:05:55 -07:00
danielgrippi
797a6f5ca9 like comments js response wip 2011-07-11 15:02:46 -07:00
danielgrippi
2e15b6a61e Likes in comments, cache counter disabled for now. 2011-07-11 15:00:48 -07:00
Raphael Sofaer
e59f49aace Fix specs after merge 2011-07-11 14:38:51 -07:00
Raphael Sofaer
eafe6a7c85 Merge branch 'ajaxy-comments' 2011-07-11 14:05:45 -07:00
Raphael Sofaer
39ff51a9d7 Make comments index ajaxy 2011-07-11 14:03:59 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
594c9b02b1 A admin is now able to allow open invitations 2011-07-11 13:32:02 -07:00
Raphael Sofaer
3f555eefc4 Server side of ajaxy comments done, need to modify comments/_comments and make it work. 2011-07-11 09:11:16 -07:00
Raphael Sofaer
2fb0fce1a8 Nest likes and comments routes in the post route 2011-07-10 21:44:34 -07:00
Raphael Sofaer
97ca10ddda Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController 2011-07-10 20:06:31 -07:00
Manuel Schölling
0855144a0a Issue #842: Sortable aspects 
Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
 2011-07-10 20:37:11 +02:00
Raphael Sofaer
968100860a Don't show commented tags in the tag stream for now, until we optimize that 2011-07-07 15:39:28 -07:00
Raphael Sofaer
e98cc4b960 Sort on and index taggings, ftw 2011-07-07 15:14:29 -07:00
Raphael Sofaer
d0ce257107 Revert "Revert "Merge branch 'hashtags-in-comments'"" 
This reverts commit d2e26f6937.
 2011-07-07 15:10:04 -07:00
danielgrippi
d2e26f6937 Revert "Merge branch 'hashtags-in-comments'" 
This reverts commit f85d5ad6d4, reversing
changes made to b8d70393f4.
 2011-07-07 13:39:15 -07:00
danielgrippi
9d506231b1 querying correctly in tagscontroller to include posts with comments containing hashtag 2011-07-07 12:27:48 -07:00
danielgrippi
b8d70393f4 include authors and profiles on tags show page 2011-07-07 11:14:10 -07:00
Raphael Sofaer
8cf0fa8446 Don't get tags in the publisher 2011-07-07 10:48:07 -07:00
danielgrippi
b1fc87ea30 add basic overview page to admin controller 2011-07-06 19:08:09 -07:00
danielgrippi
76382b074c fix jammit warnings; specs 2011-07-06 14:32:40 -07:00
Raphael Sofaer
9765bdc391 Don't get posts for a hovercard request 2011-07-06 14:11:07 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1c79c2c6f0 made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses 2011-07-06 12:45:16 -07:00
danielgrippi
675d9d7485 wip. Person#as_json is breaking right now 2011-07-06 12:45:16 -07:00
MrZYX
8c1c546bdf fixed #884 2011-07-06 15:38:54 +02:00
Raphael Sofaer
4a9900dff6 Fix some ui bugs on the post show page 2011-07-05 18:52:00 -07:00
Raphael Sofaer
2a9fc776e6 Downcase tag name in tagscontroller 2011-07-05 18:03:46 -07:00
Raphael Sofaer
0ac28cd9ea Pending spec for 500 on capital letters 2011-07-05 17:31:49 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
0ab961e096 tags controller fixed 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2d8b5bd54c refactored the controller, moved flash message into translations 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d15673c3de changed the variable name 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f0d9d318e8 a user can now follow and unfollow a tag 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1e4ee472b7 WIP you can now follow a tag, needs a clean up, and ajax love 2011-07-05 15:03:26 -07:00
Raphael Sofaer
4f056dca8e Ajax in likes in stream 2011-07-04 22:10:30 -07:00
danielgrippi
9debec4410 fix the build. 2011-07-04 16:53:43 -07:00
danielgrippi
00448f615e dont try to preload photos as they are only for StatusMessages. ugh. 2011-07-04 16:38:28 -07:00
danielgrippi
9eac29d15e preload people and their profiles in comments on aspects/index 2011-07-04 16:14:04 -07:00
Raphael Sofaer
af6547815e Some view helper cleanup 2011-07-04 07:36:01 -07:00
Michael Sofaer
d2b7168195 Use an explicit per_page param instead of switching on format 2011-07-03 21:16:58 -07:00
danielgrippi
829c86823d remove dislikes; didn't change the db structure, just removed the traces in the code since we're not using them 2011-07-03 20:08:11 -07:00
Maxwell Salzberg
a104f4e309 if a user is logged in, redirect them to the proper authenticated view, not the public route 2011-07-03 09:13:39 -07:00
danielgrippi
8a8f8db9ad Merge branch 'notifications' 2011-07-02 17:53:55 -07:00
Dan Hansen
eb0fbe519c remove read/unread state, always mark notifications as read, only return 5 notifications for json requests 2011-07-02 16:39:01 -07:00
Raphael Sofaer
f161377480 Stop loading contact objects on the main page, all we need is people 2011-07-02 16:28:52 -07:00
Raphael Sofaer
86c06c4d15 Try taking out some contact loading again 2011-07-02 14:43:15 -07:00
Raphael Sofaer
6b46d69b65 Revert "Take off the including of contacts in aspectscontroller. Cross your fingers for a performance boost." 
This reverts commit 7baeaebe57.
 2011-07-02 14:38:17 -07:00
Raphael Sofaer
7baeaebe57 Take off the including of contacts in aspectscontroller. Cross your fingers for a performance boost. 2011-07-02 12:39:25 -07:00
Dan Hansen
05688c2f43 notifications wip 2011-07-01 22:46:54 -07:00
danielgrippi
24483548ec need to grab all contacts on aspect index for autocomplete 2011-07-01 22:26:08 -07:00
danielgrippi
8bf6ad45a5 various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine) 2011-07-01 22:04:36 -07:00
danielgrippi
1a2ba034ab added edit links in aspect_nav; removed ununsed icons; fixed facebox duplication on aspect/index 2011-07-01 17:23:58 -07:00
danielgrippi
f90dc0996a More visual cleanup; top nav; edit aspects 2011-07-01 16:12:14 -07:00
danielgrippi
41773cb29e Almost done with left-nav, added link to aspect edit facebox, colored share button 2011-07-01 14:22:38 -07:00
danielgrippi
238e859dbe add contact images to aspect index, removed comment background color, add vertical rule to people pages 2011-07-01 10:49:20 -07:00
danielgrippi
ca76db4550 DG RS left nav almost there. touched up publisher, among other things 2011-07-01 10:49:19 -07:00
danielgrippi
55efe132c5 corrected authorizations_controller_spec to assert on response codes 2011-06-29 17:10:43 -07:00
danielgrippi
144ac82577 only allow https and www.cubbi.es in authorizations controller for now 2011-06-29 16:40:43 -07:00
Raphael Sofaer
5243a3203f Fix AS::Photo show page 2011-06-29 11:33:32 -07:00
danielgrippi
b8ea8e9e75 start a conversation with an aspect from contact index page 2011-06-28 23:09:11 -07:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
 2011-06-28 17:13:38 -07:00
Michael Sofaer & Raphael Sofaer
d355e230b1 all aspects helper 2011-06-27 19:51:35 -07:00
Dennis Collinson & Michael Sofaer
839756573d set post correctly 2011-06-27 19:51:35 -07:00
Dennis Collinson & Michael Sofaer
f9e8e7a041 notifications tests pass 2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
46c83a7c7d reset the notifications helper to master's version and monkey patch header 2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
8f5358e68f Move some DB logic from helper to controller 2011-06-27 19:51:35 -07:00
Michael Sofaer
d6ba3c970c proof of concept for notifications overlay 2011-06-27 19:51:35 -07:00
Michael Sofaer
ef7580a698 Notifications page works with Vanna 2011-06-27 19:51:35 -07:00
danielgrippi
89ca5cf337 DG DH; fix the build 2011-06-27 19:26:03 -07:00
danielgrippi
73fe74c834 updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber 2011-06-27 18:58:29 -07:00
danielgrippi
00ffade884 sub menu for people only sharing with you on contacts page 2011-06-27 17:22:36 -07:00
Raphael Sofaer
b14271342a Give more information in error message 2011-06-27 17:09:05 -07:00
Raphael Sofaer
240eb78b08 Change homepage_url to application_base_url 2011-06-27 16:44:18 -07:00
danielgrippi
44b77c58a3 just have a remove from aspect icon when viewing an aspect in contacts index 2011-06-27 16:26:54 -07:00
danielgrippi
f839714646 added aspect filtering to contact index. fixed rspec 2011-06-27 15:03:39 -07:00
danielgrippi
1fe4c3c3de don't group by 2011-06-27 14:06:03 -07:00
danielgrippi
85da6d340f sort contacts by last name on contacts page 2011-06-27 14:00:15 -07:00
Raphael Sofaer
17917528f6 IZ, RS, Move AS::Photo controller spec into integration so that rack middleware is run. Make auth failure return 401 rather than 302. 2011-06-27 12:31:47 -07:00
danielgrippi
a2609f7dac simple filter on contacts index page (my/all contacts) 2011-06-27 12:12:50 -07:00
Raphael Sofaer
c7b4e2b4f4 Merge remote branch 'drummondj/1049-unconfimed-tags' 2011-06-26 23:24:03 -07:00
Raphael Sofaer
d002c14aab Initial implementation of allowing cross-origin requests in the webfinger flow, so that the unhosted guys can use Diaspora. May not work with caches-page on host-meta. We'll have to use X-Accel-Redirect or something. 2011-06-26 20:29:39 -07:00
Raphael Sofaer
b9c2d3758b What is this? 2011-06-26 20:09:21 -07:00
John Drummond
cc6f82fbc1 Added test for new plantext tag without a # symbol and fixed broken code. 2011-06-25 23:37:51 -07:00
John Drummond
f7abaab276 Issue 1049 fixed by pre-processing params[:profile][:tags_string] and adding # when required 2011-06-25 23:19:30 -07:00
Raphael Sofaer
4fef3b7172 Docs because I forgot what StatusMessagesController#new is 2011-06-25 16:17:38 -07:00
Raphael Sofaer
b3556870d3 Merge remote branch 'yithian/1049-allow-plaintext-tags' 2011-06-25 11:23:55 -07:00
danielgrippi
54ef22b83e lol, just needed to remove 'http://' in the specs to get the controllers passing again 2011-06-24 18:38:30 -07:00
Raphael Sofaer
5884a900a2 Get rid of manage 2011-06-24 16:55:40 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f9b09d32f8 cucumber is passing rspec is red 2011-06-24 12:02:15 -07:00
danielgrippi
0b5de2aa7a WIP getting rid of app_url in params 2011-06-24 11:22:44 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d186246db0 added temporary special casing on app_url in authorizations controller 2011-06-23 19:13:26 -07:00
danielgrippi
74a7c3ab00 collapsed oauth2 migrations; made app factory 2011-06-23 14:49:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
052adc3213 Fix authorizations controller and app_config specs, require 2048 bit keys. We're now using config/application.yml.example in the test env. 2011-06-23 14:20:53 -07:00
danielgrippi
a9b7cd1254 nicer auth prompt. wip. 2011-06-23 12:40:47 -07:00
Alex Chvatal
7a56322b60 Adds ability to parse plain-text tags 
Tags that haven't been autocompleted and clicked on will be
added as tags as well. There should only be one tag like this
at a time, since adding a space between tags turns it into
a list item.
 2011-06-23 12:23:16 -04:00
danielgrippi
13810336d3 load monkeypatched models in authorizations controller 2011-06-22 18:32:24 -07:00
danielgrippi
5917f0d695 added JWT verification support to diaspora 2011-06-22 16:15:03 -07:00
Raphael Sofaer
e8552fc417 Fix direct query execution issues in PG by using select_values/select_rows instead of execute. 2011-06-22 14:47:59 -07:00
Raphael Sofaer
2d3eeb9c46 Get another couple specs green on pg 2011-06-19 16:16:31 +02:00
Maxwell Salzberg
1f11e51a9b add object_aspect_ids to status_message controller 2011-06-16 15:59:03 -07:00
Maxwell Salzberg
41e8a32b28 tests for data methods 2011-06-16 15:47:16 -07:00
Maxwell Salzberg
86f4f983f6 move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz 2011-06-16 11:17:14 -07:00
Ilya Zhitomirskiy
75a1012c1c moved the monkey patching to a model, need to do a couple of validations 2011-06-15 18:30:05 -07:00
Ilya Zhitomirskiy
b3cee70ead if the request is bad give it as a response 2011-06-15 17:51:29 -07:00
Ilya Zhitomirskiy
78253b6885 resetting the token instead if the app already exists, should move the lookup to be homepage url 2011-06-15 16:36:35 -07:00
Ilya Zhitomirskiy
ec9932e491 green on all the cucumbers WOOT 2011-06-14 18:30:43 -07:00
Raphael Sofaer
cba63030c9 Use rescue_from in CommentsController 2011-06-14 18:06:13 -07:00
Ilya Zhitomirskiy
dca2eca67c cucumber specs are green 2011-06-14 15:36:05 -07:00