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

1301 commits

Author SHA1 Message Date
Jonne Haß
89c1fd5f7f query the set url only through #pod_uri in the app 2012-09-26 20:19:37 +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ß
7a478704d5 just stop settingslogic from breaking rspec output for now 2012-09-26 18:54:14 +02:00
Devendra
a2fa083c3e added rspec tests and refactored user model to use scope, for daily, monthly, and yearly actives 2012-09-22 01:56:34 +05:30
Jonne Haß
2f9dbdbd86 use self instead of AppConfig to query redis_url inside AppConfig 2012-09-18 15:52:57 +02:00
Jonne Haß
358ed79f99 Merge branch 'update_devise' 
Conflicts:
	Gemfile.lock
 2012-09-12 15:11:34 +02:00
Jonne Haß
142e38e78b update devise 2012-09-12 13:29:57 +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ß
8a759c3aca Use Builder::XChar.encode instead of to_xs in spec 2012-09-07 00:09:43 +02:00
Jonne Haß
a488dd50c4 follow up of last commit fixing remaining specs 
changed spec since it didn't actually test what it said
 2012-09-06 22:11:04 +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
f19f6110b1 match tag arrays by what they actually contain, not by order 2012-05-24 22:18:10 +02:00
Florian Staudacher
d815cf5d82 take acts-as-taggable-on gem from git, solve tag case-sensitivity 2012-05-21 17:20:04 +02:00
Florian Staudacher
788f328a77 resolve reshare root posts to the first one 2012-05-18 01:45:41 +02:00
Florian Staudacher
fd5aedeb01 updated webmock, hopefully fix cucumber 2012-05-18 00:21:04 +02: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
Steven Hancock
605b418d42 Reshares delegate nsfw to the root post 
fixes #3120
 2012-05-08 03:20:01 -07:00
danielgrippi
c31413e73c green build = happy dan 2012-05-07 14:30:30 -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
a52d8f221a don't post to feed; post to joindiaspora OG tag. also, whoever has the diaspora OG tag, can i haz? 2012-05-03 00:02:00 -07:00
danielgrippi
8cecedc53b TIMELINE TIME. 2012-05-02 23:28:56 -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
63a0a37171 width and height should now federate 2012-04-20 12:53:02 -07:00
Maxwell Salzberg
1b2440f68a we now store image height and width locally; still need to federate the values 2012-04-20 12:22:12 -07:00
Maxwell Salzberg
6d7f6129fe remove puts in spec [ci skip] 2012-04-19 17:47:32 -07:00
Dennis Collinson
7f3c4c209e fix post spec 2012-04-19 14:37:46 -07:00
Dennis Collinson
8386179f16 max, you're a princess, WIP 2012-04-19 11:15:59 -07:00
Jonne Haß
83103c4761 deterministic stream order take 2, this time with spec 2012-04-12 16:33:02 +02:00
Maxwell Salzberg
ba917ec80b some sad fixes to try and appease travis :( 2012-03-27 16:31:56 -07:00
danielgrippi
9c0ed946a7 no more rspec failures; and suppress a warning with a backported 
monkeypatch
 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
a2aabeb599 remove ActiveSupport::SecureRandom 2012-03-21 13:49:34 -07:00
Maxwell Salzberg
ba01d3a7af some sad fixes for webmock in the facebook service spec 2012-03-19 20:07:36 -07:00
Maxwell Salzberg
3cb7003361 remove the swallowing of generic messages from facebook and twitter postiing. I want to know why sometimes these things are failing 2012-03-19 19:17:46 -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
7bac633987 invite_link functionailty mostly works 2012-03-16 17:56:35 -07:00
Florian Staudacher
7b4c377df1 make tests happy 2012-03-15 19:44:18 +01:00
Diaspora Europe
97d6b8dab8 notifications update spec and cleanup json response 2012-03-13 11:46:14 +01:00
Maxwell Salzberg
db0859a83c bug fix: you can now mention and post a photo at the same time 2012-03-07 14:42:46 -08:00
Maxwell Salzberg
bd021bbd91 Correct our general exception handling. 
thanks @mperham! see: http://t.co/Jyt7vV4I
 2012-03-03 16:26:06 -08:00
Daniel Grippi
7a774661bb Merge pull request #2777 from stwf/tweak-twitter-truncation 
take url shortening into effect before truncating twitter posts
 2012-02-29 22:49:46 -08:00
Steven Fuchs
66afb7baff use a stub instead of creating a post to simpy supply text 2012-02-25 23:59:02 -05:00
JMSilla
8178e0712c Users controller small fix; removed the to_activity method and the corresponding tests for status_message model 2012-02-25 22:24:43 +00:00
Dennis Collinson
04bd507025 federated generators take a user 2012-02-09 19:01:01 -08:00
Dennis Collinson
5e26a7e6bb Participate stream query uses participations 2012-02-09 19:01:01 -08:00
Dennis Collinson
14b9f5dc5b move user modules into user namespace. 2012-02-09 19:01:01 -08:00
Dennis Collinson
f3c1eff3e9 Refactor Relayable Creation 2012-02-09 19:01:00 -08:00
Dennis Collinson
9e1816dc12 Participations are a federated, relayable model :) 2012-02-09 19:01:00 -08:00
Maxwell Salzberg
3d569cc4bc fix for some crazy lack-of-stubbing on some http requests... 2012-02-09 16:20:22 -08:00
Diaspora Europe
8eda9aaf52 added user_is_following method, added 2 model specs 2012-02-09 14:17:43 +01:00
danielgrippi
a819f38b99 touch interacted_at on Post#after_create 2012-02-07 21:32:10 -08:00
Dennis Collinson
a72a09a24c posts made by nsfw people are marked nsfw by default 2012-02-07 19:37:38 -08:00
Dennis Collinson
558ceec92a a user can mark themselves as nsfw 2012-02-07 19:03:20 -08:00
danielgrippi
a3e13e3c0e User#like! method. 2012-02-03 14:42:03 -08:00
danielgrippi
4f7dda6012 bang! kill redis cache. 2012-02-02 12:45:43 -08:00
Sarah Mei
085d6552b3 Drop comments, likes, and PMs from people who the (post/conversation) owner is ignoring. 2012-02-01 17:52:11 -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
Jonne Haß
7a8bd7595b do not auto follow back if already sharing 2012-01-31 14:34:09 +01:00
Steven Fuchs
487c404d0d incorporated suggested improvements to spec. 2012-01-29 19:51:18 -05:00
Steven Fuchs
5d15fa43b5 take url shortening into effect before truncating twitter posts 2012-01-29 17:42:17 -05:00
danielgrippi
005b165e87 defer dispatching to help app processes not bloat in memory 2012-01-26 13:24:53 -08:00
Jonne Haß
9c67cd7eb9 collapse Post#last_three_comments and Commentable#last_three_comments, do not double query comments in CommentsController#index for a JSON response, remove spec that tests ordering as it's not deterministic on psql without specified order 2012-01-25 12:44:50 +01:00
danielgrippi
eaed3505e4 Don't create share_visibilities for public posts, sans migration of deleting old data. 2012-01-24 16:49:07 -08:00
Jonne Haß
100625d18c fix people and person specs for the guid stuff on psql 2012-01-24 23:02:07 +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
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
0ce0e47ff8 fix #2698; allow a user to delete a reshare of a deleted post 2012-01-19 15:24:07 -08:00
danielgrippi
5721c9e512 remove depricated methods 2012-01-18 13:29:43 -08:00
Maxwell Salzberg
392e317962 fix person spec 2012-01-17 22:10:03 -08:00
Maxwell Salzberg
22bd70664f fix post spec 2012-01-17 21:12:47 -08: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
Maxwell Salzberg
b09e76a0ce introduce base_pod_uri, so we can support domains that use www and [bare] with webfinger 2012-01-17 17:34:42 -08:00
Steven Fuchs
a11c8d8a96 javascripts for marking notifications items as unread on both the notifications page and popup menu. 2012-01-17 19:20:42 -05:00
danielgrippi
91e3f5f6ff remove cache counter for photos, as it was causing too many edge-case errors & added complexity across models 2012-01-14 15:40:43 -08:00
danielgrippi
240d595714 removing photos_count method from StatusMessage in hopes of fixing the counter (still a bit confused, though...) 2012-01-13 23:33:59 -08:00
Maxwell Salzberg
9dbe644b25 fix app_config spec 2012-01-13 15:03:44 -08:00
danielgrippi
aed413b463 remove unused method and controller action (move_contact) 2012-01-13 12:15:32 -08:00
Maxwell Salzberg
258d55df51 fully reset app_config spec to prevent test polution 2012-01-12 16:11:41 -08:00
Maxwell Salzberg
408bafca09 add/refactor normalize_pod_services so configured services is always defined regardless if SERVICES are set up 2012-01-12 15:04:14 -08:00
danielgrippi
0e5bb81d66 remove all references to the websocket. bang bang. 2012-01-10 12:28:19 -08:00
danielgrippi
52e3f1b240 DC DG; test stream view WIP 2012-01-07 14:23:21 -08:00
Maxwell Salzberg
68f25c8d4e fix app_config spec as we broke out setup into its own method 2012-01-05 19:05:13 -08:00
Jonne Haß
52c75a7ad4 Revert "Revert "auto follow back feature"" 
This reverts commit 6408105917.

Conflicts:

	db/schema.rb
 2012-01-04 13:49:56 +01:00
Maxwell Salzberg
71b58fa6fc only queue process_photo jobs if the owner is local. this should cut down on some resque errors 2012-01-04 00:08:29 -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
Maxwell Salzberg
43090d38eb AppConfig in heroku can now read array variables 2012-01-03 16:18:51 -08:00
robhogg
6571ec2fa9 Added test for nsfw? 2012-01-02 21:24:44 +00:00
danielgrippi
176a33880f fix all specs minus one from o_embed_data_spec 2011-12-31 14:19:54 -05:00
Sarah Mei
6236fd22a0 Found 3 spec files that were never getting run because they didn't have the _spec at the end of the filename. This commit renames them, so that they are now included in rake spec. Unsurprisingly, they all fail. Since they represent actual changing code that isn't tested, I'm checking them in anyway. Thx Pistos for pointer to the first file, which prompted me to look for others. 2011-12-27 14:48:39 -08:00
Jonne Haß
d063db42aa fix app config spec 2011-12-24 00:04:04 +01:00
danielgrippi
0f42c98a7b merge Pistos's reshare branch into master 2011-12-20 14:42:18 -08:00