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

2429 commits

Author SHA1 Message Date
Ilyaaaaaaaaaaaaa Zhitomirskiy
e45278a043 notification for reshares WIP 2011-08-25 17:16:09 -07:00
Gonzalo Rodríguez
31733e1f9f Merge pull request #1686 from grzuy/1486-invalid-birthday-crash 
Fix #1486 profile update was crashing with invalid birthday date
 2011-08-25 16:40:57 -07:00
Maxwell Salzberg
bcae8a1952 chubbies needs its own way of assigning a current user 2011-08-23 17:16:15 -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
Raphael Sofaer
c95f80be42 Re-nullify chubbies output and correctly handle diaspora_id param in create_account 2011-08-23 16:37:50 -07:00
Raphael Sofaer
76b0f31020 Fix the chubbies icon_url field, that needs to be icon path or be a url 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
Dan Hansen
6b040c7b4a clean up websocket receiver, add specs to content updater 2011-08-22 20:03:38 -05:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7fd7fa968c fixed the email from header issues and backfilled few tests 2011-08-22 17:38:40 -07:00
Andrej Kacian
59ba3f85e6 Moved live() bindings for post hide icon from Stream.initialize to Stream.initializeLives 2011-08-22 20:18:02 +02:00
Andrej Kacian
9fd4432e5a Fix a jasmine test in CommentToggler 2011-08-22 20:05:18 +02: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
Sarah Mei
163ac103cd Haven't figured out why reset password email body is blank, but I pulled it into a controller test so we can figure it out there instead of in a cucumber feature. 2011-08-21 16:45:53 -07:00
Andrej Kacian
395df041db Made toggleComments jasmine test aware that there are more posts in the fixture 2011-08-22 00:38:34 +02:00
Andrej Kacian
2a52face12 Add jasmine test for ajax spinner display 2011-08-22 00:38:34 +02: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
ceedbb14cb Closes #1486. Profile update was crashing with invalid birthday date 2011-08-20 00:34:59 -03:00
Gonzalo Rodriguez
234af2a15b Fixing some tests that weren't testing correctly 
These assertions were always returning true even if you dont populate
the flash, because nil.should_not be_empty returns true
 2011-08-19 23:57:33 -03:00
Raphael Sofaer
a74080e27d Fix ServicesController spec 2011-08-19 16:52:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
834c75894c jasmine is green again 2011-08-19 14:42:28 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
96d183a041 fixed private message emails not including the message 2011-08-19 11:33:55 -07: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
Raphael Sofaer
60e9fd54e2 Fix a problem with re-saving deleted objects in a spec in postgres, add postgres to test group in gemfile 2011-08-18 16:05:14 -07:00
Raphael Sofaer
31584eed84 It turns out find_for_database_authentication calls find_for_authentication, not the other way around. 2011-08-18 16:05:14 -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
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
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
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
danielgrippi
bf0eb3dac3 4 failures left in postgres 2011-08-17 14:18:51 -07:00
Raphael Sofaer
88b317f0c1 Fix jasmine spec for aspectFilters 2011-08-17 10:17:14 -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
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
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
7b85dcec9c dg rs; seed bob with facebook friends & fixed invitation view 2011-08-12 17:05:00 -07:00
Raphael Sofaer
8b743e7e3b Fix stack level too deep error on reshares 2011-08-12 13:20:25 -07:00
Raphael Sofaer
cd640e1ac6 Pending spec for statusnet linkback plugin 2011-08-12 10:37:24 -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
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
danielgrippi
08f12ee348 fixed the 'a post' bug in notification emails 2011-08-11 14:40:45 -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
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
3431cd94fb Make resque job specs specific about what error should be raised; fix expectation on hoptoad notifier 2011-08-10 16:36:42 -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
Andrej Kacian
a904b59a03 Add rspec test for correct behavior of /u/nonexistentuser URL 2011-08-10 22:25:35 +02:00
Raphael Sofaer
1df654d416 Send a correct backtrace and some other nice things to airbrake on resque errors 2011-08-10 11:10:13 -07:00
danielgrippi
aa3d626ada validate instead of throwing a db error 2011-08-10 10:38:28 -07:00
Maxwell Salzberg
8df5ba0c77 remove stray puts 2011-08-10 10:32:44 -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
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
4fb4f71169 prevent duplicate services from being created 2011-08-09 19:01:38 -07:00
Raphael Sofaer
333081f8b1 Fix resque job logging spec 2011-08-09 17:05:34 -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
87ffce4f64 Get hoptoad notifications working from resque 2011-08-09 16:04:23 -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
bddd7c717b Write jasmine test for the tag unfollow icon visibility 2011-08-09 22:54:31 +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
Andrej Kacian
e5b6850556 Fix the test 2011-08-07 00:44:37 +02:00
Andrej Kacian
6cf42fb8ba Better stab at the jasmine test. 2011-08-06 23:37:21 +02:00
Andrej Kacian
2716316dac Add jasmine test for #1587 fix. 2011-08-06 23:37:21 +02:00
Sarah Mei
a62325be23 Fix references to facebox in jasmine specs. 2011-08-06 14:36:12 -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
dde4b30180 Fix rspec specs 2011-08-05 22:29:27 -07:00
Raphael Sofaer
7052654b25 Update factorygirl, fix the searcheable_person factory to work with factory_girl 2.0.3 2011-08-05 15:45:05 -07:00
Raphael Sofaer
f0f388d9e1 Fix weird error in jasmine suite 2011-08-05 15:09:16 -07:00
danielgrippi
6a56e3298c only show connect to services if all services not already connected 2011-08-03 19:02:54 -07:00
Raphael Sofaer
61eea529cb Don't update target.updated_at when updating target.likes_count 2011-08-03 18:36:34 -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
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
d51e495925 fetch featured users from remote servers on app init unless already in the db 2011-08-03 18:02:56 -07:00
danielgrippi
c9eeeb6150 ms dg; profile (step 1) finished 2011-08-03 18:02:56 -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
168ccc11b0 Call collapseText on stream initialize 2011-08-03 12:47:48 -07:00
Raphael Sofaer
0b1ef41838 Scope stream scrolled events to new elements 2011-08-03 12:36:07 -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
Raphael Sofaer
be5453f0b4 Fix photo show pages with likes 2011-08-02 10:17:49 -07:00
Raphael Sofaer
65c4b1ceaf Merge pull request #1711 from gandaro/1602-delete-profile-photo 
test for issue #1602's fix; typos
 2011-08-01 16:11:17 -07:00
Raphael Sofaer
8d88818ea0 Merge pull request #1712 from ticho/typofix-in-featured-contacts-test 
Fix typo for contacts_controller #featured test
 2011-08-01 16:10:43 -07:00
Raphael Sofaer
2a0df9841a Correct batch emailer fixture 2011-08-01 16:00:01 -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
3d88095ba2 Updating batch inviter 2011-08-01 14:49:21 -07:00
Andrej Kacian
a5e8db04a0 Fix typo for contacts_controller #featured test 2011-08-01 23:20:23 +02:00
Jakob Kramer
4b9c8487e6 test for issue #1602's fix; typos 2011-08-01 20:12:30 +02:00
Sarah Mei
b7b1c6b276 Fix interaction between I18n fallbacks and our interpolation fallback code. Refactor I18n tests into their own file. Remove some test support code that made it hard to test I18n. 2011-07-30 22:41:46 -07:00
Maxwell Salzberg
bb8db654d6 add basic pod error logging, and added guard and removed autotest 2011-07-30 11:44:27 -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
Raphael Sofaer
54a5d96391 Add a couple tests for post federation, because Max is suspicious 2011-07-29 17:21:10 -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
Raphael Sofaer
f9bf34a73e Fix defaults for activerecord models in i18n 2011-07-29 15:51:38 -07:00
Raphael Sofaer
bea333842f Make sure that a MissingInterpolationArgument in the english locale is raised 2011-07-29 14:30:20 -07:00
Raphael Sofaer
b56838e5b1 Fall back to english on MissingInterpolationError 2011-07-29 14:30:20 -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
091701e565 Pending spec for allowing an unknown commenter to comment on a public post 2011-07-29 11:08:38 -07:00
Maxwell Salzberg
9d0764dadb two failing tests for the mobile site. SOMEBODY FIX THEM 2011-07-29 10:14:59 -07:00
Dan Hansen & Sarah Mei
2d9a709212 Fix contacts spec - default order on the association means we need to reload after adding one 2011-07-28 23:38:17 -07:00
Maxwell Salzberg
b2bce9e1b2 update jquery mobile to beta1 2011-07-28 23:32:41 -07:00
Maxwell Salzberg
a325970e5d test to make sure mobile site does not 500 with all media types 2011-07-28 13:16:43 -07:00
maxwell
7a5852e73a fix a bug with openssl keys in development. note to future max and 
rafi.  never monkey patch anything on the top of a completely random
model. never again. ever.

TODO: look into replacing a monkey patch on a to_s in User#generate_key
that makes the single test green, but my dell had a heart attack other
places, that might just be sqlite3 or my dell
 2011-07-24 20:06:07 -07:00
Raphael Sofaer
99aafb18cd Reshares show up on sharing, prevent multi-resharing, still need to make that ui nice 2011-07-22 17:13:31 -07:00
Raphael Sofaer
0e2936f069 Reshare spec, not repost spec 2011-07-22 16:03:54 -07:00
Raphael Sofaer
78bced56bb Reshares and reshare retractions are green. 2011-07-22 16:00:19 -07:00
Raphael Sofaer
4b1d5b772d Failing spec for the second retraction for a reshared post, reshares need to refer to guids 2011-07-22 14:19:58 -07:00
Raphael Sofaer
ad5dba052c First reshare retraction spec is green 2011-07-22 13:12:12 -07:00
Raphael Sofaer
17774d8b3b Getting repost back to almost green. 2011-07-21 19:15:47 -07:00
Raphael Sofaer
a1bf22fe7e More work on retracting posts with reshares, one failing spec on User#retract 2011-07-21 18:23:34 -07:00
Raphael Sofaer
7382dfb7be Multi-server spec now successfully passes along a reshare 2011-07-21 18:23:33 -07:00
Raphael Sofaer
e19fb6d0f8 Use authority instead of host in order to get the port as well. 2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
537766d0d7 Started working on repost integration test 2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
bd1c8efe54 wip integration servers 2011-07-21 18:23:33 -07:00
danielgrippi
2d6f51f68c repost wip 2011-07-21 18:22:18 -07:00
danielgrippi
987d44c41c fixed reshare specs; all specs green 2011-07-21 18:22:18 -07:00
danielgrippi
a8400ad460 2 more specs failing. wip 2011-07-21 18:22:18 -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
7b3180e5da user can retract a reshared post 2011-07-21 18:22:17 -07:00
danielgrippi
f3a515eef1 DG IZ reshare retractions is WIP 2011-07-21 18:22:17 -07:00
danielgrippi
d1bbbdbc4c fixed all specs; rebased. 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
20de3a5622 Refactor StatusMessagesController#create, move the photo dispatching into an after_dispatch hook 2011-07-21 16:30:00 -07:00
Maxwell Salzberg
ad8ccbbeb9 added test for admin inviter 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
757c9169fc updated gemfile 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
eee2225f04 rspec is green 2011-07-21 14:32:10 -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
Raphael Sofaer
d30228abb8 Merge remote branch 'untitaker/1589-remove-unicode-smileys' 2011-07-17 21:12:20 -04:00
Dan Hansen
6a11784a2e Rewrote ContactsController#index, thoughts? 2011-07-17 15:44:07 -07:00
Markus Unterwaditzer
d4257f4a68 Removed unicode smileys, #1589 2011-07-17 10:45:06 +02:00
danielgrippi
22fdf7f895 fix 500 on posts show on mobile 2011-07-15 22:37:21 -07:00
danielgrippi
c4b715f3ff fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews 2011-07-15 21:22:29 -07:00
Raphael Sofaer
f60a748c21 Ajax in the contacts for mentioning after page load 2011-07-15 14:23:44 -04:00
danielgrippi
3e7e2b4d2a DH remove test pollution from EventBroker#subscribe spec 2011-07-14 18:03:30 -07:00
Dan Hansen
bdb4c888a9 Remove embedder spec from git repo, it's now in spec/javascripts/widgets/embedder-spec.js 2011-07-13 22:49:32 -07:00
Dan Hansen
ca2413ff6b Widgets now subscribe to a widget/ready event. Apply change to all widgets, added some tests & lots of cleanup. 2011-07-13 22:23:31 -07:00
Raphael Sofaer
abe10b3889 Comment out falsely failing JS tests, we should just stop using extend, it is needlessly hard to test. 2011-07-13 11:03:55 -07:00
Maxwell Salzberg
6523f0542a require haml in chubbies to kill error 2011-07-12 20:19:38 -07:00
Raphael Sofaer
14759b2c80 Use person_link in notifications_helper, move hovercard css out to a file 2011-07-12 16:21:03 -07:00
Raphael Sofaer
e30b82dd45 Fix resend links in inviter 2011-07-12 15:08:03 -07:00
danielgrippi
039b65b5cc a little js cleanup for post.js 2011-07-12 00:12:08 -07:00
danielgrippi
d364f158b8 cache counters in for likes. pending Diaspora::Likeable module... 2011-07-11 15:05:55 -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
d1f2bc5fcb Remove object_path spec 2011-07-10 21:05:55 -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
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
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
310b9969f3 hashtags module now in comments. not sure how to pull back relevant posts on tags/show from here... 2011-07-07 12:21:57 -07:00
Raphael Sofaer
1f448e8555 as_json wants a string 2011-07-07 10:56:55 -07:00
Raphael Sofaer
8cf0fa8446 Don't get tags in the publisher 2011-07-07 10:48:07 -07:00
Raphael Sofaer
a1ee8eb83b stub tests for not n-querying in the publisher 2011-07-07 09:06:24 -07:00
danielgrippi
b1fc87ea30 add basic overview page to admin controller 2011-07-06 19:08:09 -07:00
danielgrippi
f3d185fe41 hovercard on comments 2011-07-06 17:13:11 -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
Daniel Grippi
0cd3878bb8 Merge pull request #670 from galaxor/1137-bad_rsa_keys 
1137 bad rsa keys
 2011-07-06 10:00:44 -07:00
MrZYX
8c1c546bdf fixed #884 2011-07-06 15:38:54 +02:00
Raphael Sofaer
0ac28cd9ea Pending spec for 500 on capital letters 2011-07-05 17:31:49 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
027f096ca7 turns out for the join in the controller to work the current user needs to have contacts to whom they went to, added a spec 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
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
Ryan Hughes
2f89f19f34 Test sending to people with bad rsa keys. 2011-07-04 18:00:55 -07:00
danielgrippi
9debec4410 fix the build. 2011-07-04 16:53:43 -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
Sarah Mei
58ac33607a Fix build - stub request in notifications#index specs 2011-07-03 20:48:42 -07:00
danielgrippi
511a651377 don't query for mentioned people if mention syntax isn't present in message text. 2011-07-03 20:36:46 -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
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
290fb1e7f5 Cut 45 seconds out of the comments feature by using factories 2011-07-02 13:40:30 -07:00
Maxwell Salzberg
2d9d9bd1a1 Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same"" 
This reverts commit 696779d589.
 2011-07-02 12:05:26 -07:00
Maxwell Salzberg
696779d589 Revert "remove perform delegate: use a gem that unobtrusivly does the same" 
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9.
 2011-07-02 12:01:31 -07:00
Maxwell Salzberg
dd752d7dd9 remove perform delegate: use a gem that unobtrusivly does the same 
thing. use built in resque inline method for single process mode
 2011-07-02 11:57:10 -07:00
Raphael Sofaer
3baf433b3a More travis stuff 2011-07-02 00:50:11 -07:00
danielgrippi
8bf6ad45a5 various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine) 2011-07-01 22:04:36 -07:00
Sarah Mei
1bbfa97e5f DH SM MS pending photo spec for Dan 2011-06-30 21:04:18 -07:00
Robin Wellner
91dd4f847a Adds support for converting <-> to ↔ in markdownify 2011-06-30 14:27:39 +02: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
3887144db6 I seriously think that this commit is going to fix CI. SRSLY. 2011-06-29 15:34:45 -07:00
Raphael Sofaer
daf52eb21f Put the source back in the second Gemfile... 2011-06-29 15:03:23 -07:00
Raphael Sofaer
7ee3fcd811 Fix app_config spec 2011-06-29 14:08:25 -07:00
Raphael Sofaer
02489bb7cf This should fix CI for real 2011-06-29 12:07:10 -07:00
Raphael Sofaer
5243a3203f Fix AS::Photo show page 2011-06-29 11:33:32 -07:00
Raphael Sofaer
d6321d2327 Bundle in the oauth features, take the source out of the chubbies Gemfile 2011-06-29 11:21:23 -07:00
Dan Hansen
eaf7fcd7fe speed up notifications controller index spec 2011-06-28 23:31:34 -07:00
danielgrippi
b8ea8e9e75 start a conversation with an aspect from contact index page 2011-06-28 23:09:11 -07:00
Raphael Sofaer
0eb31e3ba7 added jwt to the chubbies bundle, made the asterisk black 2011-06-28 17:52:38 -07:00
Raphael Sofaer
4683047ee0 point diaspora client to the right place in the gemfiles 2011-06-28 17:36:01 -07:00
Raphael Sofaer
3078220bc0 Point diaspora-client to git 2011-06-28 17:25:02 -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
Raphael Sofaer
7fd9b81e55 Fix spec in authorizations_controller, get rid of pp 2011-06-28 14:37:55 -07:00
Dennis Collinson & Michael Sofaer
f9e8e7a041 notifications tests pass 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
danielgrippi
00ffade884 sub menu for people only sharing with you on contacts page 2011-06-27 17:22:36 -07:00
Raphael Sofaer
240eb78b08 Change homepage_url to application_base_url 2011-06-27 16:44:18 -07:00
danielgrippi
f839714646 added aspect filtering to contact index. fixed rspec 2011-06-27 15:03:39 -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
John Drummond
cc6f82fbc1 Added test for new plantext tag without a # symbol and fixed broken code. 2011-06-25 23:37:51 -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
bd84eaaf75 added cucumber test for re-registering a pod from a client 2011-06-23 18:57:39 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d46f3a8d1f fixed every spec but the activity stream photos controller spec 2011-06-23 15:22:36 -07:00