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

2037 commits

Author SHA1 Message Date
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
Jonne Haß
c59bb35087 Merge pull request #3754 from marpo60/housekeeping 
Housekeeping2
 2012-11-22 01:06:30 -08:00
Jonne Haß
5f6e03cfe5 Merge pull request #3714 from marpo60/refactor 
Housekeeping
 2012-11-22 01:06:05 -08:00
Fabián Rodríguez
99abc22403 remove unused methods 2012-11-21 18:26:17 -02:00
Sean Tilley
a5050273ca Merge pull request #3727 from jaywink/feature/2321-fix-message-notifications 
Fix notifications for private messages between local users, fixes #2321
 2012-11-19 13:48:17 -08:00
Dennis Schubert
ae53254259 Really remove Devises timeoutable... 
... and force it to really remember the session by a hidden field.
 2012-11-14 20:32:15 +01:00
David McMullin
97664cb880 port tagFollowings to BackBone 2012-11-12 21:37:00 +00:00
Jason Robinson
6cf6f1dd7d Fix notifications for private messages between local users, fixes #2321 2012-11-11 23:35:19 +02:00
Jason Robinson
48a332f871 Remove by default markdown formatting from posts done via service, currently only used by Twitter. Remove markdown also from Facebook posts. 2012-11-09 00:04:49 +02:00
Fabián Rodríguez
4056c0da9e remove unused method #can_add? 2012-11-06 21:39:36 -02:00
Jason Robinson
7fafabdb60 Only include url to post for twitter when post exceeds maximum length or contains photos 2012-11-03 23:25:19 +02:00
Jonne Haß
2a45470232 Merge branch 'feature/fix-facebook-public-posts' of git://github.com/jaywink/diaspora into feature/fix_services 
Conflicts:
	Changelog.md
	app/models/services/facebook.rb
	spec/models/services/facebook_spec.rb
 2012-11-02 11:31:47 +01:00
Jason Robinson
e974d2934f Always use basic Facebook Graph API to post messages, fixes public posts. Remove unnecessary Facebook opengraph config items 2012-11-02 00:23:33 +02:00
Jonne Haß
5a70311fe7 update and fix services 2012-10-25 17:54:18 +02:00
Dennis Schubert
5ea998a382 Change 'unless' to 'if' again because 'unless' is wrong here. 
Also, add some specs and add it to the changelog.
 2012-10-24 00:27:45 +02:00
Jonne Haß
4b5b7fc77f Revert "Merge pull request #3655 from denschub/feature/fix-followhq-setting" 
This reverts commit b0fc95764d, reversing
changes made to 0057e9ed46.
 2012-10-21 22:12:36 +02:00
Dennis Schubert
7dc629179b Change 'unless' to 'if' because 'unless' is wrong here. 2012-10-12 00:59:42 +02:00
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
Jonne Haß
e70e48d6ca some refactoring regarding the law of demeter 2012-09-23 19:33:19 +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ß
6c1a1ec6d2 it's enviroNment 2012-09-15 18:52:12 +02:00
Jonne Haß
9e264b5258 hotfix typo, thanks david 2012-09-15 18:28:43 +02:00
Jonne Haß
48dcccf7b3 Unify redis initialization 
REDISTOGO_URL is now deprecated in favor of REDIS_URL which is supported by the redis gem too.
 2012-09-15 18:23:22 +02:00
Jonne Haß
142e38e78b update devise 2012-09-12 13:29:57 +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ß
ffde639f4d Merge branch 'betastrip' of git://github.com/DeadSuperHero/diaspora 2012-09-12 04:55:10 +02:00
Sean Tilley
49ea8c8563 Strip Beta Features 2012-09-11 21:52:53 -05: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
Maxwell Salzberg
8b7934006e Merge pull request #3491 from fermionic/issue-3420-remote-comments-dont-delete 
Give relayable retractions a chance to propagate locally before deleting the target
 2012-08-30 13:04:59 -07:00
Zach Prezkuta
0a396b16b1 only delete object of relayable retraction after it has been relayed or federated 2012-08-09 08:55:55 -06:00
Florian Staudacher
8f1204d05a first working version of a 'post fetcher' for remote accounts 2012-08-04 13:22:03 +02:00
Maxwell Salzberg
718f7e1dbb Merge pull request #3260 from panckreous/twitter-conf 
check for existence of key instead of checking secret twice
 2012-06-26 10:34:08 -07:00
Steven Hancock
a2f208b013 User model - mass-assignable attributes fix 
`:username`, `:email` and `:remember_me` should be mass-assignable.

fixes #3377
 2012-06-18 16:58:36 -07:00
Maxwell Salzberg
d331a14dd2 limit the amount of people in a converasation to prevent hella spam 2012-06-17 15:51:18 -07:00
Steven Hancock
033e8e5cb6 Fix ActiveRecord queries - take two 2012-06-13 14:52:25 -07:00
Steven Hancock
79b7d38158 Fix ActiveRecord queries with nested hashes 
Rails 3.2.6 doesn't like them
 2012-06-13 14:18:09 -07: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
e021fd821d Merge pull request #3362 from diaspora/non-public-error-page 
show a "post is not public" message when visitor is not logged in
 2012-06-11 02:35:48 -07:00
Zach Prezkuta
44e43158cc add rspec test and make fix more rails-y 2012-06-08 22:51:16 -06:00
Zach Prezkuta
ed51f34ebb strip comment text upon comment creation 2012-06-08 22:51:16 -06: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
Florian Staudacher
d815cf5d82 take acts-as-taggable-on gem from git, solve tag case-sensitivity 2012-05-21 17:20:04 +02:00
Alex Connor
fe984eb426 #3287 using reorder instead of order for newer, older 2012-05-20 18:21:34 -05:00
Florian Staudacher
788f328a77 resolve reshare root posts to the first one 2012-05-18 01:45:41 +02:00
Maxwell Salzberg
471ce309ea kill your darlings; remove diaspora_client with fire 2012-05-17 14:55:53 -07:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00
Dennis Collinson
927b78b79d kill references to ServiceUser 2012-05-14 18:47:14 -07:00