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

1457 commits

Author SHA1 Message Date
Florian Staudacher
0d51bba959 port bookmarklet to Backbone.js, use gon for params (fixes #4931) 2014-04-19 17:41:21 +02:00
Hincu Petru
2311b761e1 Redirect to stream_path if is destkop 2014-04-08 09:34:14 +00:00
Steffen van Bergerem
eabdc7390c Port aspect membership dropdown and hovercards 2014-03-19 17:54:22 +01:00
Steffen van Bergerem
f217a5bc11 Add filters to notifications controller 2014-03-19 17:54:22 +01:00
Jonne Haß
d4e046ecbc Merge pull request #4787 from hincupetru/4726-infinite-photo-stream 
Added limit by max_time to photos#index for prevent "infinite photo stream"
 2014-03-15 19:07:48 +01:00
Hincu Petru
e0b23b2dc4 Fixed #4726 infinite photo stream 2014-03-12 22:22:24 +00:00
MatrixCrawler
3273028ed2 Fix atom feed for reshares of deleted posts. 
Propose for fix #4638

Added Changelog line

Added Specs for testing if the reshared origin post is deleted and therefore not shown in the atom feed
 2014-03-11 21:27:08 +01:00
Steffen van Bergerem
0241d9c7db use fixture 2014-03-10 17:21:54 +01:00
Jonne Haß
2e8dc8fb61 move PasswordsController specs to the new appropiate location 2014-02-10 10:18:20 +01:00
arlogn
1563d088bc embedding youtube videos over https 2014-01-30 18:01:27 +01:00
Jonne Haß
9ea6e9c166 Merge pull request #4517 from Zauberstuhl/report_post_feature 
Added post reporter feature

Conflicts:
	Changelog.md
	app/assets/stylesheets/application.css.sass
	db/schema.rb
 2014-01-20 10:03:45 +01:00
Lukas Matt
5c9a3aaf3e Added post report feature 
You can report a single post by clicking the correct icon in the controler section

Workflow:
* Report a post as offensive
* Trigger alerts to every pod-admin
* Pod-admin can review it in the admin interface
* Delete the post or mark it as reviewed
 2014-01-14 15:00:55 -05:00
Jonne Haß
32b9caa08c replace stub and mock deprecations with doubles 2014-01-13 12:25:38 +01:00
Jonne Haß
df0bff6537 replace stub! with stub 2014-01-13 12:25:37 +01:00
Fabian Rodriguez
08acd6e5bf bump Timecop 
Time.now remains the same inside the block, outside of the block it
returns
 2014-01-12 23:27:15 +01:00
Jason Robinson
35ece9d65f Instead of redirect on signup form validation, render new with submitted data. 2014-01-06 22:12:07 +02:00
Jonne Haß
c660c90091 Merge pull request #4612 from diaspora/drop_spv_old_code 
Drop spv old code
 2013-12-11 07:41:51 -08:00
Jason Robinson
2c83d0e846 Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings. 2013-12-02 22:35:18 +02:00
Fabian Rodriguez
92db8cb929 remove #next and #previous from posts_controller 2013-12-01 20:55:48 -02:00
Jonne Haß
f9a3990562 do not leak photos through photos#show 2013-08-26 09:39:39 +02:00
Jonne Haß
554d0a93d0 Do not leak photos in the profile sidebar 2013-08-20 20:56:37 +02:00
Oliver Azevedo Barnes
4b516603f7 Fix #4361 twitter access level check breaking facebook addition to user 
Rewrite twitter access-level check

Fixed tests, still working on getting facebook up

Add heroku example to diaspora.example.yml
 2013-08-12 13:17:18 -05:00
Jonne Haß
14c78da6cd whitelist getting_started as a user settable attribute, fixes #4378 2013-08-11 16:52:54 +02:00
Oliver Azevedo Barnes
452301b34d Fix #4361 twitter access level check breaking facebook addition to user 2013-08-07 18:59:49 -05:00
Jonne Haß
a2e5f1f88e Merge pull request #4335 from Team-D/feature/4169-tag_search_autocomplete 
#4169 tag search autocomplete
 2013-08-06 13:29:12 -07:00
Jonne Haß
efbd3c8605 Merge pull request #4344 from oliverbarnes/4124-check-twitter-write-access-before-auth 
Issue #4124 Check write access before authorizing Twitter
 2013-08-06 21:21:56 +02:00
Oliver Azevedo Barnes
55a58713a5 Issue #4124 Check write access before authorizing Twitter 2013-08-05 13:52:19 -05:00
mokus
df9a42c397 update search controller + serch.js so that autocomplete works 
Added search_controller_spec, moved some tests from people_controller_spec to search_controller_spec

Fixed merged conflict in Changelog

update routes and search controller

remove useless except from search controller

Fix indentation in search_controller
 2013-08-05 11:49:23 +02:00
Jonne Haß
2055a0aef8 Merge branch 'jflemingprod-feature/4143-port_to_strong_parameters' into develop 2013-08-02 11:44:55 +02:00
James Fleming
e8db2804cb Fix ProfilesController#update spec for tags. 2013-08-02 11:39:06 +02:00
James Fleming
d6ba6d1b02 Use strong params in photos_controller 
Add specs to check mass-assignment gotchas in PhotosController.
 2013-08-02 11:39:05 +02:00
James Fleming
a0a9f01be1 Remove tests for strong parameters 
Remove a duplicated test.
 2013-08-02 11:38:56 +02:00
James Fleming
938de466f8 Strong parameters for Aspect 2013-08-02 10:09:04 +02:00
carolina
f6fe74aeae Migration to turn ActivityStreams::Photo to StatusMessage 
deletes ActivityStream model and all it's references

update migration with the without_protection option to disable mass assignment protection
 2013-07-31 15:15:08 +02:00
kevivmatrix
6623e86a5a private message sending changed to ajax 
added specs for change in controller

one form of hash used in single line of code

rendering create response on sending message

redirect user to conversation page if message sent successfully

removed deprecated way of rendering file

conversations create for mobile fixed

minor code style change

updated changelog
 2013-07-06 14:35:09 +05:30
David Thompson
0cc02fb512 Use InviteEmail worker in InvitationsController create action. 2013-07-01 21:10:56 -04:00
Jonne Haß
521aaf894b Merge pull request #4255 from netom/4194-mobile-photo-view 
4194 mobile photo view
 2013-06-29 10:06:46 +02:00
Jonne Haß
92d3bb9c69 Merge pull request #4252 from Raven24/diasp-feature/1283-coppa-admin 
Admin: find users under the age of 13 (COPPA)
 2013-06-29 10:03:59 +02:00
Jonne Haß
94207e844c Drop weird stop in conversations controller spec 2013-06-27 17:50:44 +02:00
Tamas Laszlo Fabian
d59648504d Added test to avoid regression 2013-06-24 15:37:17 +02:00
Florian Staudacher
02be4a5335 make age search postgres compatible, add spec, changelog 2013-06-24 12:34:22 +02:00
David Thompson
b3c859bcd5 Check for nil before splitting contact_ids param. 2013-06-15 17:14:30 -04:00
Braulio Martinez
c651cbab78 Always redirect user to downcase version of tags on UTF-8 encoding 2013-04-10 00:08:58 -03:00
Jonne Haß
79a79d65d6 Bye Resque. Ohai Sidekiq. 
* Dropped all references to Resque
* Moved all jobs under app/workers since that's the Sidekiq convention
* Renamed Jobs module to Worker to match new location
* Adapted all jobs to Sidekiq
* Replaced all enqueue calls with perform_async
* Dropped Resque hacks from specs and features, replaced with
  sidekig/testing in RSpec and sidekig/testing/inline in Cucumber
* Updated scripts to start a Sidekiq server
* Inline Sidekiq sinatra app
* Let Sidekiq create the actual Redis instance
* Workaround already initialized constant warnings in service models
* Resolved ToDo in one job definition by creating proper exception clases
  for some errors in receiving posts
* Added sidekiq section to configuration to make it completly
  configurable to the user
* Add Sidekiq middleware for clean backtraces
* Delay HttpMulti retry to give offline pods a chance to come back up
* Do not retry on GUID already taken and alike errors
* Be graceful about deleted posts in GatherOEmbedData
 2013-03-21 23:39:07 +01:00
Marcelo Dominguez
88e76448b6 Avoid unnecessarily redirect 2013-03-03 23:10:53 -02:00
Jonne Haß
cf9659de4a fix XSS vulnerability in conversations#new, closes #4010 2013-02-26 19:09:30 +01:00
Jonne Haß
35350d1ceb Include reshares in the public user feed, closes #1781 2013-02-21 14:32:28 +01:00
Florian Staudacher
4cbae601e8 [WIP] aspect membership dropdown Backbone.js rework 
* initial backbone port
* changed AspectMembershipsController#destroy to use aspect_membership_id
* included rudimentary jasmine specs
* more specs, updating the list elements after de-/selection
* update selected aspect count on button
* don't even try to render html in AspectMembershipsController
* more specs for button summary text
* adapt aspect management on contacts page and in the popup boxes
* adapt inline creation of aspects + memberships

TODO
* more tests
 2013-02-17 13:40:10 +01:00
Jonne Haß
b8128d356b Merge branch 'hotfix/0.0.2.4' into develop 
Conflicts:
	Changelog.md
	app/views/people/show.html.haml
	config/defaults.yml
	spec/helpers/layout_helper_spec.rb
 2013-02-01 22:24:37 +01:00
Jonne Haß
7134513b28 Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948 
From a quick look at the for us available databases this was not actually used in the wild.
 2013-02-01 22:20:31 +01:00
movilla
0010819343 add settings web mobile 2013-01-27 20:38:19 +01:00
Fabián Rodríguez
aabbea6ee2 fix issue #3671 reshare a post multiple times 2013-01-12 04:52:56 -02:00
Diaspora Europe
c8ddba6b3e add images to notifications 2013-01-11 12:30:12 +01:00
Florian Staudacher
0092acd492 re-add hovercards 
* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
 2012-12-28 22:37:13 +01:00
movilla
597ab20715 Show error and flash-notice when sending messages to non contacts 2012-12-26 12:23:37 +01:00
movilla
c1b858a877 Mark all unread post-related notifications as read, if one of this gets opened 2012-12-24 00:13:32 +01:00
Jonne Haß
7b548fd571 Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags 
port tagFollowings to BackBone
 2012-11-25 09:30:47 -08:00
rschaden
49d4079065 add email validation to invitations 2012-11-25 14:25:20 +01:00
Fabián Rodríguez
be2db47f02 remove unnecesary stuff from specs 2012-11-21 18:26:17 -02:00
David McMullin
97664cb880 port tagFollowings to BackBone 2012-11-12 21:37:00 +00:00
Jonne Haß
63f2d335a4 Merge branch 'notifications_count' of git://github.com/movilla/diaspora into develop 2012-11-11 15:00:46 +01:00
movilla
554fe40235 Web mobile notificacions count dont change to unread-read when click in link post 2012-11-11 14:45:07 +01:00
movilla
10aea3ebce add test :unread => true 2012-11-10 23:23:08 +01:00
Braulio Martinez
ab3a7d991c Remove ugly whitespaces 2012-11-07 23:16:25 -02:00
Braulio Martinez
3260bada38 Remove posts#new action from Rails and related tests 2012-11-07 23:14:35 -02:00
Gonzalo
e1756b5b3f Privatize non-action controller methods 2012-10-14 19:32:53 -02:00
Gonzalo
78953fe2bf Move ApplicationController specs to application_controllers_spec 2012-10-14 19:32:53 -02:00
Gonzalo
83809c924a Refactor MessagesController 2012-10-13 17:10:52 -02:00
Fabián Rodríguez
82082005ba redirect users back on registration failure 2012-10-11 19:47:04 -02:00
Florian Staudacher
8678c14735 Merge pull request #3589 from MrZYX/refactor_config 
New configuration system, details: see changelog
 2012-09-30 13:07:40 -07:00
Marek Lewandowski
125e45cdba Force user to authenticate instead of raising error 2012-09-29 16:57:34 +02:00
Jonne Haß
2a4db54db9 New configuration system 
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
 2012-09-26 20:19:37 +02:00
Jonne Haß
4bada36bf1 do not redirect admin to his profile upon sign in 2012-09-14 15:01:19 +02:00
Jonne Haß
58d1448085 update factory girl 2012-09-12 13:24:23 +02:00
Jonne Haß
ab0ad630df strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep 2012-09-12 05:48:12 +02:00
Jonne Haß
088446e86e bump rspec-rails, remove deprecated rspec syntax 2012-09-11 00:46:36 +02:00
Jonne Haß
81442f0f2a Erb::Util.h now escapes ' which it didn't before 
this is what 3.2.8 actually fixes to prevent XSS iirc
We're including the raw message in the atom feed so
we should test for it
 2012-09-06 21:12:49 +02:00
Florian Staudacher
99c6b8bf45 don't test for actually deleted likes, 
instead check whether the `retract` method was called, everything
else should be tested there.
 2012-09-05 23:48:23 +02:00
Maxwell Salzberg
e0408e6fae dont auto beta flag anyone 2012-08-20 10:39:14 -07:00
Florian Staudacher
c7f66ee647 add specs for #3464 2012-07-25 15:22:53 +02:00
Florian Staudacher
1809897aa2 should fix the mobile toggle for the case: desktop --to--> mobile #3299 
also, (possibly) fix tablet issue #3421, + tests
 2012-07-04 01:47:55 +02:00
Steven Hancock
a8de3a5a3f Rails.root and File.join cleanup 
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
 2012-06-11 03:13:20 -07:00
Florian Staudacher
8ca39f5936 show a "post is not public" message when visitor is not logged in 
and tries to access a show page of a non-public post
 2012-06-07 22:16:37 +02:00
Maxwell Salzberg
1da029a22f this stopped working because there is a new way to render views by default in spec_helper.rb 2012-06-04 12:49:24 -07:00
Maxwell Salzberg
304c33f19e explicitly render_views in publics controller 2012-06-04 12:49:24 -07:00
danielgrippi
3e09d4ed14 Revert "don't seed beta users with default aspects" 
This reverts commit 946f78b025.
 2012-05-24 11:42:52 -07:00
danielgrippi
946f78b025 don't seed beta users with default aspects 2012-05-24 11:37:34 -07:00
Dan Hansen
cf847d61ba bug mash #5 
fix NoMethodError on InvitationsController
 2012-05-23 13:05:01 -07:00
Maxwell Salzberg
471ce309ea kill your darlings; remove diaspora_client with fire 2012-05-17 14:55:53 -07:00
Maxwell Salzberg
b124d3e5a1 Revert "update factory girl" new version does not support 1.8.7 :( 
This reverts commit c52342b7cb.
 2012-05-16 17:43:56 -07:00
Maxwell Salzberg
c52342b7cb update factory girl 2012-05-16 17:17:14 -07:00
Maxwell Salzberg
06f389231a kill services users with fire. we need this feature, but we need to just start from scratch because this is redonkalonk 2012-05-14 16:25:19 -07:00
Dennis Collinson
f6e3c1b88b seperate interactions from posts 
Lazily load post interactions on show page
hella refactorz
 2012-05-12 17:41:58 -07:00
Dennis Collinson
efa79a4ad7 Refactor Post Presenter 
and comment presenter
 2012-05-10 12:24:21 -07:00
Maxwell Salzberg
eaedfc9827 create a new publisher using the new composer. only for beta users 2012-05-09 16:55:33 -07:00
danielgrippi
0ec364e44c DG MS; popup on services, inlined in the composer 2012-05-08 18:09:33 -07:00
Dennis Collinson
d1d99d5dd4 Jamie Cai DC refactor isOwnProfile, fix tests 2012-05-07 17:53:37 -07:00
Dennis Collinson
1c135b61fd Jamie Cai DC message in profile when user has no posts 2012-05-07 15:56:30 -07:00
Maxwell Salzberg
7d0f79c29b fix pg rspec 2012-05-07 15:43:53 -07:00
danielgrippi
01d5c0473a DG MS; don't redirect to legacy getting started if you're a beta user 2012-05-07 12:05:36 -07:00
danielgrippi
92230383a7 added controller test; put wallpaper into separate wallpaper/ directory 2012-05-06 12:35:11 -07:00
Dennis Collinson
bd6a9cfe00 next and previous now return post as json 
clean up controller
 2012-05-05 16:41:16 -07:00
Maxwell Salzberg
e79d78302e when a user is invited from a beta user, they are also beta 2012-05-04 17:38:08 -07:00
Maxwell Salzberg
273470e6ed include url in all twitter posts 
also fix a homecontroller spec
 2012-05-03 20:07:56 -07:00
danielgrippi
1b6c33aff5 show a user's full profile info if she's on her own page. duh. 2012-04-28 17:41:22 -07:00
danielgrippi
d5f511c325 hitting profiles.json publically displays only public stuff; if you're connected to a user, it shows that user's complete profile response 2012-04-28 17:05:25 -07:00
danielgrippi
bbd4ee5738 correctly redirect for beta and admin users (profile vs stream homepages) 2012-04-28 15:09:02 -07:00
Maxwell Salzberg
592a3f99b5 Role system to replace the yml admins and community spotlight. we can 
also now add a beta role
 2012-04-27 16:14:43 -07:00
Maxwell Salzberg
2b3bc5a0f0 fix profile json birthday response with some tests. 2012-04-26 16:00:23 -07:00
Maxwell Salzberg
d22a98cd96 monkey patch to_xs for ruby 1.8, and fix a test as a result 2012-04-25 11:38:42 -07:00
danielgrippi
84bd1fb1fc return the person json response for profiles to get a correctly formatted name and expected avatar response; fix a jasmine spec around redirection 2012-04-23 23:31:39 -07:00
Dennis Collinson
062de4c269 MDC DC New Profile shows users info 
Profile show json
Profile backbone model
 2012-04-21 13:12:56 -07:00
Maxwell Salzberg
ab48ca260b kinda ugly hack for ports in url with iframes 2012-04-18 16:12:57 -07:00
Maxwell Salzberg
90a2f05515 include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770 2012-04-17 22:28:01 -07:00
Florian Staudacher
d9d7bbb74b using timecop for interactions + whitespaces removed 2012-04-15 03:10:18 +02:00
Maxwell Salzberg
e521ac92f9 make a test slightly dumber for travis 2012-04-03 16:52:34 -07:00
Steven Hancock
125be41868 Test for mobile UI single post view 
Verify that the correct layout is rendered (rather than no layout
at all) in the mobile UI single post view.

This is a test I forgot to write at 5am when I was so excited about
having the mobile UI working on my Blackberry again (bad me!), so
here it is before it slips my mind. 😁

This tests the change made to posts_controller in 6abe718227
 2012-03-29 21:07:21 -07:00
Maxwell Salzberg
033bf637cd Merge pull request #3070 from SuperTux88/fix-invite-mail 
Fix invite mail NOTICE: MIGRATION ON USERS INCLUDED!
 2012-03-29 15:41:23 -07:00
Diaspora Europe
9fdca1adf8 make URL clickable in RSS #2176 2012-03-29 13:43:04 +02:00
Benjamin Neff
e57d3672cd add rspec controller test 2012-03-29 03:29:41 +02:00
Maxwell Salzberg
ba917ec80b some sad fixes to try and appease travis :( 2012-03-27 16:31:56 -07:00
Dennis Collinson
775eca0026 MS DC You can has choose a template 2012-03-27 14:52:53 -07:00
Stephan Schulz
716315409a Limit allowed contacts for sending messages to, to the ones that are sharing with you. 2012-03-23 01:21:04 +01:00
Diaspora Europe
88bb3403d8 added 3 invalid status message specs 2012-03-22 17:24:30 +01:00
Diaspora Europe
e8933fa1da added status message html and mobile spec 2012-03-22 16:59:14 +01:00
Diaspora Europe
97233851df added status message spec, fix render nothing 2012-03-22 16:52:19 +01:00
danielgrippi
9c0ed946a7 no more rspec failures; and suppress a warning with a backported 
monkeypatch
 2012-03-21 13:50:24 -07:00
danielgrippi
5c431d933f MS DG down to four failures 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
39c7478b4a Revert "freeze time in conversations show spec to make ree travis happy" 
as it did not work :/

This reverts commit d668b21cd4.
 2012-03-17 19:21:24 -07:00
Maxwell Salzberg
d668b21cd4 freeze time in conversations show spec to make ree travis happy 2012-03-17 19:06:26 -07:00
danielgrippi
852687b31c MS DG fix a few final tests 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
319b3c4d3b fixed rspec tests, more fit and finish around how the invite code works, 
and improving admin functionality
 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
6b97b8044b small updates, and it looks like we are mostly working 2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987 invite_link functionailty mostly works 2012-03-16 17:56:35 -07:00
danielgrippi
5e75c6d675 fix jasmine around contact-list.js 2012-03-14 16:26:30 -07:00
Maxwell Salzberg
36f9ca6b1a resolve merge in notifications controller 2012-03-14 10:46:59 -07:00
Diaspora Europe
05f2be40e1 added test for notification dropdown #2998 2012-03-14 17:02:18 +01:00
Diaspora Europe
7fd39b2896 mobile: added index and read all tests to notification spec #2997 2012-03-14 15:58:07 +01:00
Maxwell Salzberg
b8b6557379 adding an ajax loader, and pull out the js from the middle of the view 2012-03-13 17:10:23 -07:00
Steven Fuchs
9de477cf5a jasmine spec up and working. code out of (no longer called) contacts info page object. Fixed namespaces and created jasmine fixture for empty and pending searches. 2012-03-07 23:19:51 -05:00
Steven Fuchs
ee237c6c5f jasmine spec for stimulating deferred searches 2012-03-07 23:19:51 -05:00
Steven Fuchs
7d3a6a061c add spec to ake sure background query is only set when a full diaspora id is given. 2012-03-07 23:19:51 -05:00
Steven Fuchs
7048fa6d50 fixing conflicts in merge 2012-03-07 23:19:50 -05:00
Steven Fuchs
23aff2af5e run second search ajaxily when no results are found from remote pod. 2012-03-07 23:19:50 -05:00
Maxwell Salzberg
67e4f9e159 remove puts and fix a conversationscontroller spec to be a bit more predictable 2012-03-03 16:25:10 -08:00
Maxwell Salzberg
0d93227f07 hopefully make travis happy: 2012-02-28 17:52:13 -08:00
danielgrippi
61b4e77bde Merge branch 'profiles' 2012-02-28 10:29:17 -08:00
Dennis Collective
7abbe4a642 Merge pull request #2925 from diasp/2833-conversations-should-return-json 
Conversations should return json #2833
 2012-02-27 17:34:10 -08:00
Dennis Collective
f5ef1e8c14 Merge pull request #2814 from stwf/aspects-javascript-fixes 
update aspect name in aspects listing after editing.
 2012-02-27 17:19:05 -08:00
danielgrippi
0112285985 Merge branch 'master' into profiles 
Conflicts:
	lib/diaspora/shareable.rb
 2012-02-27 14:27:05 -08:00
Maxwell Salzberg
42a93f9490 remove weird monkey patch in sessions controller #wtf 2012-02-25 17:41:46 -08:00
Maxwell Salzberg
27a4c1bf2d introduce the idea of Federated::Base. this is mostly just renaming and collasping of different federation modules, but also starting a direct hiearchy of these federation classes to make everything easier to refactor 2012-02-25 16:57:14 -08:00
danielgrippi
73f224e690 don't render page-viewer twice; last_post should actually get the last post posted, not the first one 2012-02-24 21:48:37 -08:00
Diaspora Europe
57de352238 added some specs for json response 2012-02-24 10:22:16 +01:00
Dennis Collinson
9769dfb303 cukes passing 2012-02-23 17:24:19 -08:00
danielgrippi
8f3cc6769c update reshare count when resharing; return PostPresenter for reshare root in the success response 2012-02-22 18:02:08 -08:00
danielgrippi
899136d0e5 display proper counts after feedback actions; modified destroy responses to return PostPresenter objects 2012-02-21 21:44:44 -08:00
danielgrippi
a0e8f161f5 fix notifications controller. yay. 2012-02-18 16:26:18 -08:00
danielgrippi
debdd6cb6b change routes to properly reflect page names (activity/stream). 2012-02-18 16:26:16 -08:00
Florian Staudacher
8249847e9c bookmarklet now is a complete html document (+test) 
it auto-expands to the size of the text that was selected
it self-closes after posting again
 2012-02-18 16:26:15 -08:00
danielgrippi
2f7465450e you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-18 16:26:15 -08:00
Diaspora Europe
55cb328fe2 tags should be case insensitive 2012-02-18 16:26:10 -08:00
Florian Staudacher
0222e4b2ee added intentionally failing specs, because dirty input breaks bookmarklet 
see also #2741 #2751 #2800
 2012-02-18 16:26:09 -08:00
Florian Staudacher
cab953848f added tests for photos page 2012-02-09 23:12:39 +01:00
Maxwell Salzberg
062204e963 Merge pull request #2848 from beardedninja/master 
#2847 Users can now toggle nsfw on and off
 2012-02-08 17:21:29 -08:00
Maxwell Salzberg
a9b6426323 Merge pull request #2839 from diasp/2036-fix-private-messages-navigation 
#2036 Fix private messages are sometimes displayed without navigation
 2012-02-08 16:59:50 -08:00
danielgrippi
84eb313e20 updated routes to reflect page titles (explore/participate) 2012-02-08 14:40:28 -08:00
Alex Harrison
0cbdf51e6a #2847 Users can now toggle nsfw on and off 2012-02-08 23:01:02 +01:00
Diaspora Europe
e4e1362ff5 added spec for redirect to conversations_controller_spec 2012-02-08 16:53:48 +01:00
danielgrippi
fafa74a222 fix spec, mustache scoping issue in partial. 2012-02-05 21:23:45 -08:00
danielgrippi
a3e13e3c0e User#like! method. 2012-02-03 14:42:03 -08:00
Steven Fuchs
ef7dc1c017 update aspect name in page listing after editing. 2012-02-03 08:37:35 -05:00
Dennis Collective
6dbd644b01 Merge pull request #2719 from stwf/return-contact-popup-to-notify 
aspects popup menu missing from 'started sharing' notifications
 2012-02-03 00:42:10 -08:00
danielgrippi
4f7dda6012 bang! kill redis cache. 2012-02-02 12:45:43 -08:00
Steven Fuchs
532a49a56d no need to generate notification fixtures at this point. 2012-02-02 10:45:42 -05:00
danielgrippi
310a0679f1 particpate stream, yo! 2012-02-01 16:05:16 -08:00
danielgrippi
02021584a7 EvilQuery for Participation, refactor comment creation 
you can now create a comment with User#comment!(post, text)
 2012-02-01 15:09:31 -08:00
Sarah Mei
7389b895d6 Fix #2799 - bullet points in a post that has 'read more' 2012-02-01 14:31:07 -08:00
Steven Fuchs
77fc4b6cab moved tests from jasmine to controller specs 2012-01-31 13:58:41 -05:00
Steven Fuchs
5ea4bc0a1b Merge remote branch 'upstream/master' into return-contact-popup-to-notify 2012-01-29 18:13:30 -05:00
Jonne Haß
f674494d2a todo better id/guid switching hack needed 2012-01-29 15:15:24 +01:00
Jonne Haß
0e7b084713 fix 500 in PostsController#show for non existing post 2012-01-29 14:47:51 +01:00
Maxwell Salzberg
13d1e68540 refactor people#index 2012-01-28 23:48:37 -08:00
Sarah Mei
1f710232d8 Clicking 'read more' now removes the link and collapses the adjacent paragraphs. Also: hella semicolons. Fixes #2766 2012-01-28 22:29:43 -08:00
Sarah Mei
0e0d40d00e Remove pagination from json format of contacts#index; add explanatory comments. I KNOW. But it's super confusing and I can't find a way to rewrite the code to be more clear. Soloing FTL. 2012-01-28 15:31:11 -08:00
Sarah Mei
3ec09930fe Refactor contacts#index specs. json requests now paginate correctly, but infinite scroll is still broken. 2012-01-28 14:43:47 -08:00
Sarah Mei
d40746bff7 Fixes #2713 - searching for punctuation now doesn't throw a 500. Refactored people#index specs. 2012-01-28 13:45:39 -08:00
danielgrippi
31bfef9dd2 pass in service_type strings instead of objects to deferred_dispatcher. 2012-01-27 16:05:38 -08:00
Maxwell Salzberg
c69df0fb29 fix photos controller test 2012-01-27 13:06:27 -08:00
danielgrippi
005b165e87 defer dispatching to help app processes not bloat in memory 2012-01-26 13:24:53 -08:00
Jonne Haß
e1658f8d8b switch PhotosController#index over to guid, fix #2729 2012-01-25 12:45:02 +01:00
Steven Fuchs
5f705775cd spec to generate some notification fixtures and jasmine specs to test them. Notably making sure that start sharing items have an aspects popup menu. 2012-01-24 23:04:35 -05:00
Jonne Haß
100625d18c fix people and person specs for the guid stuff on psql 2012-01-24 23:02:07 +01:00
Daniel Grippi
89472992cc Merge pull request #2720 from MrZYX/people_slash_guid 
use guid instead of id for /people/ urls
 2012-01-24 13:14:08 -08:00
Jonne Haß
19785d909b ensure services is an array in StatusMessagesController#create 
This fixes posting to a single service for Ruby 1.9
For some reason Rails doesn't convert a single foo[]=bar
not to the expected :foo => ["bar"] but to :foo => "bar"
On Ruby 1.8 String#map exists and just yields self, on
Ruby 1.9 String#map got removed
 2012-01-24 18:54:36 +01:00
Jonne Haß
7aaaf4f43b use guid instead of id for /people/ urls 2012-01-23 23:35:31 +01:00
Daniel Grippi
2c50de0726 Merge pull request #2714 from stwf/im-sorry-bye-vanna 
Remove Vanna Controller from app and fix up notifications controller, views, scripts, specs
 2012-01-22 22:15:14 -08:00
Steven Fuchs
e882dedd33 remove vanna controller from app, adjust scripts, specs, views and controllers to work. 2012-01-22 17:39:35 -05:00
Sarah Mei
872a96dc71 Refactor services controller spec 2012-01-22 08:28:23 -08:00
Maxwell Salzberg
49f18d435a upgrade factory girl there are 3 failing cukes. 2012-01-21 21:58:50 -08:00
Steven Fuchs
9836860ca3 Merge remote branch 'upstream/master' into im-sorry-bye-vanna 2012-01-20 12:23:45 -05:00
Maxwell Salzberg
254860bddc SM MS; Read email sent to diaspora-dev for more information about this 
commit. Add migration and rake task to copy hidden information from
share_visibilities to users. see: http://devblog.joindiaspora.com/?p=44
 2012-01-17 19:29:01 -08:00
Steven Fuchs
36fd43db4c incorporated improvements from @maxwell from last pull request. 2012-01-17 19:27:48 -05:00
danielgrippi
fdc0b681eb remove unused api serializers (cruft) 2012-01-17 16:03:24 -08:00
danielgrippi
339c47d782 moved stream logic into its own controller (StreamsController) 2012-01-17 15:53:06 -08:00
danielgrippi
bfe0b7129c move all stream actions into PostController 2012-01-17 15:53:06 -08:00
Maxwell Salzberg
35676cddac fix #2627 (webfinger produces 500 error, and refactor a little to encapsulate into Webfinger object a bit more 2012-01-14 00:40:42 -08:00
danielgrippi
efe55f395d remove ajax_stream? logic from streams now that we're using backbone & never ajaxing on mobile; remove unreferenced community_spotlight stream & controller 2012-01-13 13:50:52 -08:00
Jonne Haß
9a9cc8d826 remove spec for aspect_memberships#update too (move_contact) 2012-01-13 22:46:32 +01:00
Dennis Collinson
9b8afba9cf metaprogram template addition 2012-01-12 19:41:39 -08:00
danielgrippi
1efce2cede Revert "Merge pull request #2547 from stwf/unread_notifications" 
This reverts commit c61e84bc50, reversing
changes made to b88899ff2a.
 2012-01-11 12:11:00 -08:00
danielgrippi
bee8aa8bcd remove unused files/methods 2012-01-11 02:26:12 -08:00
danielgrippi
0e5bb81d66 remove all references to the websocket. bang bang. 2012-01-10 12:28:19 -08:00
Daniel Grippi
c61e84bc50 Merge pull request #2547 from stwf/unread_notifications 
Allow users to click on read notifications to mark them as unread
 2012-01-10 10:46:26 -08:00
Maxwell Salzberg
232c4b7931 fix for mobile multi stream [ci skip] 2012-01-07 23:31:17 -08:00
danielgrippi
e928cc805a fixed markdown issues with reshares; removed puts from specs 2012-01-07 17:33:16 -08:00
danielgrippi
24950bd364 restored ability to 'unlike' 2012-01-07 14:23:28 -08:00
Dennis Collinson
9d24b518f5 DC DG; correctly populate the stream jasmine fixture 2012-01-07 14:23:28 -08:00
danielgrippi
dbfb18e249 display reshare counts; test inf scroll & reshare counter in jasmine instead of cucumber 2012-01-07 14:23:27 -08:00
danielgrippi
1e20ca0cf5 remove old js files, specs; remove stream references in page js initializers 2012-01-07 14:23:27 -08:00
danielgrippi
4fabbe93a5 fix ResharesController / StatusMessage controller spec; remove another js response 2012-01-07 14:23:26 -08:00
danielgrippi
719e265b68 modified app to return a hash if current_user is not present; removed view specs in postsController specs & moved logic to js/jasmine 2012-01-07 14:23:26 -08:00
danielgrippi
21eba82e76 moved all jasmine fixture building into spec/controllers/jasmine_fixtures/ 2012-01-07 14:23:25 -08:00
danielgrippi
734f01402a remove double fixture rendering 2012-01-07 14:23:24 -08:00
danielgrippi
1ffdfa8465 DC DG; created feedback view; moved jasmine fixtures; modified jasmine spec helper; jasmine is green 2012-01-07 14:23:24 -08:00
danielgrippi
c6e4172926 fixed likes_controller; half of the failing jasmine tests 2012-01-07 14:23:23 -08:00
danielgrippi
9e4e58e002 fix facebook specs; comment controller specs 2012-01-07 14:23:22 -08:00
danielgrippi
34e3403e2e jasmine green again; template switching in place, defaulting to displaying post text 2012-01-07 14:23:21 -08:00
Dennis Collinson
8e3db3aebe make jasmine view tests work, load templates, party 2012-01-07 14:23:21 -08:00
danielgrippi
52e3f1b240 DC DG; test stream view WIP 2012-01-07 14:23:21 -08:00
Maxwell Salzberg
63cdd93afc the websocket has been completely removed, and replaced for a stub until 
we find a better way to reimpliment it in a  more sane way
 2012-01-03 18:39:54 -08:00
memarko
399bdb885e Update spec/controllers/tag_followings_controller_spec.rb 2011-12-26 21:51:02 +01:00
memarko
360e041bf6 Update spec/controllers/tag_followings_controller_spec.rb 2011-12-26 19:01:27 +01:00
Steven Fuchs
f72a4b4476 notifications controller should return the guid and unread state of the updated notification 2011-12-23 22:58:01 -05:00
Steven Fuchs
a1d474111b controller now only accepts string values for unread. 2011-12-23 15:35:07 -05:00
Steven Fuchs
f3486e831f changes is_unread parameter to unread 2011-12-22 22:57:05 -05:00
Steven Fuchs
f2be6e8bcf controller can accept a parameter as to whether the notification should be marked as read or unread 2011-12-22 15:20:48 -05:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
Jonne Hass
afb5e5e7f0 fix json in aspects controller spec 2011-12-11 03:35:19 +01:00
Jonne Hass
57661fe9dd fixed a couple of specs 2011-12-11 02:08:38 +01:00
danielgrippi
fb39a1e16d fix account deletion specs 2011-12-09 17:51:45 -08:00
Ilya Zhitomirskiy
0bd101dca9 change close account to clear profile, still need to dispatch account deletion xml 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
03ca34767a ms iz rendering nothing for hcard and webfinger if account is closed, not showing aspect dropdown if the user account is closed 2011-12-08 16:32:18 -08:00
Pistos
a5d1657fbd Repair posts_controller_spec.rb by refactoring them a bit. Rspec was being finnicky or something? 2011-12-08 15:35:16 -05:00
danielgrippi
beeb02dcd6 omniauth 1.0 replaced 'user_info' with 'info' 2011-12-06 17:53:41 -08:00
Gonzalo Rodriguez
3c74f3d848 Failing spec for empty search bug #2427 2011-12-03 21:19:58 -02:00
Sarah Mei
4db288bc65 Check order of generation and use of host-meta fixture on travis 2011-11-30 20:55:59 -08:00
Daniel Grippi
cec1f09202 specs green 2011-11-30 09:56:47 -08:00
Daniel Grippi
682d45d9bd Merge pull request #2426 from geckoxx/like_stream 
Like stream
 2011-11-30 09:11:17 -08:00
Johannes Hackel
23fa7a0a3e like stream new 2011-11-29 17:27:09 +01:00
Johannes Hackel
ef28e89809 people_controller_spec 2011-11-23 23:45:09 +01:00
Johannes Hackel
0c1be5002d end 2011-11-23 08:00:08 +01:00
Johannes Hackel
66acd7db14 specs, stay on page 2011-11-22 12:54:19 +01:00
Manuel
1c9a96e2aa Fixed relayable specs 2011-11-20 01:06:45 +01:00
danielgrippi
6be778b9b2 change root_path and root_url to multi_path 2011-11-14 18:01:09 -08:00
Sarah Mei & Tim Frazer
409a6aebc7 Fix invitation controller spec on postgres 2011-11-14 17:41:54 -08:00
Sarah Mei & Tim Frazer
e38cb41f85 Better error messages for folks coming in with a bad invitation token, whether by clicking the "view this invitation in your browser" link or by clicking the accept invitation button. 
Get rid of 500 error on the "view this invitation in your browser" link
 2011-11-14 17:02:13 -08:00
Kevin Fitzpatrick & Tim Frazer
96f2aaa57a Background sending password reset instructions. 2011-11-14 12:30:47 -08:00
Pistos
05b1e2fc19 Fixed issue #2380 : No more 500 error when following an unnormalized version of an existing tag. 
e.g. if "test" exists and you try to follow "Test".
 2011-11-13 23:26:53 -05:00
Jonne Hass
b3142ac208 redirect to sign in page from photo#show on a private photo when user isn't signed in 2011-11-10 22:44:12 +01:00
Pistos
39f876824a Specify a fixture path relative to Rails.root to appease the Travis. 2011-11-07 00:32:18 -05:00
Pistos
02fa065571 Whitespace cleanup. 2011-11-07 00:32:17 -05:00
Sarah Mei
f1d669a024 Delete all pending specs except stuff we actually want to fix in the short term. Add more useful comments to those. 2011-11-06 21:29:22 -08:00
Pistos
14842c1b43 Merge remote-tracking branch 'johnedmonds/issue1144' 2011-11-06 22:21:53 -05:00
Jonne Hass
7556dccb91 test that photosController#index succeeds without any photos 2011-11-06 14:47:28 +01:00
Sarah Mei
92c28857b3 Refactor and backfill tags_following_controller_spec. Move normalize tag specs into model spec. Move rss fixture file into fixture directory. 2011-11-05 16:05:13 -07:00
Sarah Mei
d17ecd6101 Fix user controller spec 2011-11-04 22:06:56 -07:00
Dan Hansen & Maxwell Salzberg
3cfa0c4602 use the stream element partials for testing the StreamElement widget instead of Aspects#index 2011-11-04 18:40:24 -05:00
Ilya Zhitomirskiy
ecd2a52553 added a password field before account closure 2011-11-04 10:25:19 -07:00
Sarah Mei
f9a9654c86 Allow non-logged-in users to see public photos 2011-11-03 22:07:48 -07:00
danielgrippi
5df6bc1adf block user now removes a contact if user is blocking a contact 2011-11-03 12:31:24 -07:00
danielgrippi
ae7944418c DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams 2011-11-03 12:31:24 -07:00
Dan Hansen & Maxwell Salzberg
5b8365118d Stream#posts no longer needs to call for_a_stream 
exclude blocked users from all streams
 2011-11-03 12:31:24 -07:00
Dan Hansen
16e76886d9 wip 2011-11-03 12:31:24 -07:00
Pistos
78a96a18e4 This fixes issue #2298. 
Following a hashtag with a dot now no longer breaks the user's stream page.
All unacceptable hashtag chars are stripped out, and the given tag is
normalized before being followed.
 2011-11-02 23:51:12 -04:00
Pistos
e885e8492f Refactor / shuffle code in TagFollowingsController spec. 2011-11-02 20:46:04 -04:00
Sarah Mei
0c818cf359 Refactor tag followings spec 2011-10-29 08:56:30 -07:00
Sarah Mei
8f0aa72e75 Don't look for specific flash messages in specs. 2011-10-29 08:47:13 -07:00
Pistos
0a1e649b2b Convert some reshare-related Cucumber features into specs. Introduce SpecDoc. 2011-10-27 23:27:14 -04:00
danielgrippi
cc56569206 fix rspec to reflect flash message changes 2011-10-27 20:07:07 -07:00
danielgrippi
0def71d74f add some feedback text & animation; added spec for collapsing tags 2011-10-27 19:57:00 -07:00
Pistos
3ce0806cbc Merge branch 'master' into issue-2032-view-comments-on-public-post-without-login 
Conflicts:
	app/controllers/comments_controller.rb
	app/helpers/comments_helper.rb
 2011-10-25 22:21:08 -04:00
danielgrippi
9fba69cd5b added person stream; temp hack for photos 2011-10-25 16:29:45 -07:00
Ilya Zhitomirskiy
431fa3fd04 removing getting started on first post and having tooltips in the 
publisher
 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
c7838debcf creating multiple tag_followings 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
8b3c4f4cf2 checking on the attribute not the method 2011-10-24 11:00:00 -07:00
Ilya Zhitomirskiy
d51516fff3 bumped carrierwave, photos can now be downloaded from a url, fetching profile photo job 2011-10-24 11:00:00 -07:00
Ilya Zhitomirskiy
c60adda3a9 WIP, almost done for twitter, just need to figure out how to follow redirects 2011-10-24 11:00:00 -07:00
danielgrippi
cff3f6ea49 green specs 2011-10-23 19:20:13 -07:00
John Edmonds
b482d16622 Merge branch 'master' into issue1144 2011-10-22 14:39:03 -04:00
danielgrippi
64f7450d6c DG MS; fix case where pod does not have any communty spotlight 2011-10-21 17:39:39 -07:00
danielgrippi
794247d07b MS DG; rename soup to stream; fix a bunch of translations 2011-10-21 14:44:02 -07:00
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
Maxwell Salzberg
59a2947ba0 fix services_controller_spec 2011-10-18 13:03:36 -07:00
Gonzalo Rodriguez
aa1623a95f Fixing person's name construction 
* When only has last_name, return last_name not diaspora_handle
* Strip contstructed name to avoid trailing or preceding space
when having only first or last name present
 2011-10-18 02:24:29 -02:00
Sarah Mei
98ef5212f3 Merge branch 'tag_stream_api' 2011-10-16 15:47:20 -07:00
Manuel Schölling
8cfb854fab Quickfixed federation of StatusMessages with photos only (no text) 2011-10-16 14:42:14 +02:00
Manuel Schölling
02a3c3f88b Introduced Shareable 2011-10-16 13:58:35 +02:00
Maxwell Salzberg
f2c16bec85 add files 2011-10-15 22:38:21 -07:00
Maxwell Salzberg
ea0240d6f8 fix broken mobile tag view 2011-10-15 21:08:22 -07:00
Maxwell Salzberg
d6e9809be1 MS SM finished tag stream refactor 2011-10-15 20:40:20 -07:00
Pistos
153615e651 Fix more specs. Added an explicit spec for all_comments . 2011-10-15 16:21:26 -04:00
Gonzalo Rodriguez
a7c0888ad2 Fix pending tag_followings spec 2011-10-15 17:06:58 -02:00
Pistos
511d51318d Refactor PostsController spec code a little. (DRY up a bit) 2011-10-15 14:56:36 -04:00
Maxwell Salzberg
f959ca0c12 refactor streams to be in a Stream module, hopefully they will auto-reload now 2011-10-13 22:26:15 -07:00
Pistos
2cd004da24 Added an additional stub_request so aspects_controller_spec.rb passes under more conditions. 2011-10-13 21:56:59 -04:00
Gonzalo Rodriguez
00e93ba765 Fix people_controller specs 2011-10-13 00:01:05 -02:00
Maxwell Salzberg
9fd1d7db63 updating gemfile and schema.rb 2011-10-11 16:53:37 -07:00
Dan Hansen
f6845c360f Revert "change namespace from Mail to Mailers" 
This reverts commit f859904c76.
 2011-10-09 23:34:03 -05:00
Dan Hansen
f859904c76 change namespace from Mail to Mailers 
locally when Resque tried to constantize Jobs::Mail Object.const_get("Jobs") returned our Jobs module but when it tried to const_get("Mail") it returned the Mail gem.
added copyright
 2011-10-09 22:41:01 -05: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
Maxwell Salzberg
cdce54bbda MS SM featured users stream. because we do what we want 2011-10-05 21:12:02 -07:00
John Edmonds
19ea9e8b6d Add tests for Content-Type returned from #create. 2011-10-01 11:48:41 -04:00
John Edmonds
dcd7e936df Add test for Opera photo upload. 2011-09-29 21:24:00 -04:00
Maxwell Salzberg
6ac0a46120 green jasmine by stubbing ajax_stream? in aspects controller 2011-09-29 18:04:21 -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
Ilya Zhitomirskiy
e8c7b570a9 small fix 2011-09-28 15:34:15 -07:00
danielgrippi
2b2443b6b9 aspect dropdown takes public and all aspects option 2011-09-27 21:09:27 -07:00
danielgrippi
4bd1f0997d fix build 2011-09-25 13:14:09 -07: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
a009c37d6f fixed the cukes and the tag following 2011-09-23 18:58:19 -07:00
Maxwell Salzberg
b1e15f6a80 make specs pending 2011-09-16 18:36:58 -07:00
Maxwell Salzberg
bc1aef4999 MS IZ start to implement followed tags in the stream 2011-09-16 18:19:34 -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
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
adaefd0cb5 MS DG rspec is green update gemfile 2011-09-13 13:34:49 -07: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
34ed07260f MS IZ DG moar salmon refactoring 2011-09-12 14:05:31 -07:00
Maxwell Salzberg
6b0507949c updated salmon to let us not always encrypt the header 2011-09-12 14:05:31 -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
danielgrippi
fe915ecb09 don't redirect to AspectsController#new from AspectsController#index if no aspect is present 2011-09-10 09:25:38 -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
Jonne Hass
bc4872d3a5 ensure handle is downcased on search, fix #1912 2011-09-07 15:17:42 +02:00
Sarah Mei
a5b120532a Use a jasmine fixture with just one post for the comment specs. 2011-09-03 17:51:51 -07:00
Sarah Mei
1a823d647e Fix comment jasmine fixture generation to be more consistent (i.e. take out more aspects.first stuff). Fix comment jasmine spec to be more consistent - remove unneeded spies, etc. 2011-09-03 12:02:51 -07: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
Maxwell Salzberg
b8ca4bfcab added Link to profile page in webfinger profile to make federation a bit easier 2011-08-31 19:57:46 -07:00
Dan Hansen
2b31999f28 pull in jasmine-ajax, start testing our ajax callbacks with meaningful responses 2011-08-31 00:00:49 -05:00
Dan Hansen
cbc168fc27 only request comments once 2011-08-30 23:12:17 -05:00
Maxwell Salzberg
e25decedc3 Merge pull request #1845 from fermionic/1811-mobile-share-button 
1811 mobile share button
 2011-08-30 11:27:36 -07:00
Sarah Mei
2255e80b69 So. It turns out that postgresql has a less-consistent idea of what .first means in an association with no default ordering. All the places we were doing bob.aspects.first (& etc.) needed to be more specific. & o ya, POSTGRES IS GREEN. 2011-08-29 22:03:05 -07:00
Zach Prezkuta
3f5dd7e5b1 Issue #1811: Share button missing in mobile version 2011-08-29 22:30:14 -06: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
cc1add81b0 Avoid RecordNotFound exception thrown by find method when invalid person_id 2011-08-27 02:45:58 -03: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
Dan Hansen
d75ef8d020 made backtotop a widget, added jquery-debounce 2011-08-26 12:30:28 -05: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
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
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
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
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
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
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
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
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
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
Raphael Sofaer
cd640e1ac6 Pending spec for statusnet linkback plugin 2011-08-12 10:37:24 -07:00
Raphael Sofaer
9a77d3518f Mobile authorizations index view 2011-08-11 16:39:39 -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
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
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
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
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
Raphael Sofaer
f0f388d9e1 Fix weird error in jasmine suite 2011-08-05 15:09:16 -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
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
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
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
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
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
5e39368414 Get rid of 500 on mobile comment creation 2011-07-29 12:01:35 -07:00