Commit graph

2010 commits

Author SHA1 Message Date
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
Dennis Collinson
a90968ea2d basic experimental stream 2012-05-14 17:57:02 -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
Dan Berman
905e38e226 check for existence of key instead of checking secret twice 2012-05-13 13:34:02 -04: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
51b1ade3bc DC DG; added LastThreeComments decorator so we don't have to load those comments when not needed (i.e. new profile pages) 2012-05-10 13:53:00 -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
a46e16cbcf delegate frame_name in reshares 2012-05-09 16:37:28 -07:00
Steven Hancock
605b418d42 Reshares delegate nsfw to the root post
fixes #3120
2012-05-08 03:20:01 -07:00
Dennis Collinson
d1d99d5dd4 Jamie Cai DC refactor isOwnProfile, fix tests 2012-05-07 17:53:37 -07:00
danielgrippi
56913ffb80 upload wallpaper for great success. 2012-05-06 12:35:11 -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
danielgrippi
73c91463f9 new publisher if person is admin as well 2012-05-02 22:07:51 -07:00
danielgrippi
ab99154a1a add FeatureFlagger to HomeController instead of making calls to Role directly 2012-05-02 20:41:01 -07:00
Maxwell Salzberg
ef657f53b8 new publisher if is you are beta, not just admin 2012-05-02 11:24:03 -07:00
danielgrippi
b3a5b8a369 only segment by beta / non-beta [ci skip] 2012-04-29 13:19:07 -07:00
danielgrippi
c06e8b3329 track anonomous user segments via analytics (let's see how successful the beta channel features are) 2012-04-29 11:37:05 -07:00
danielgrippi
c3b0bbd425 show new profile pages for those who have it activated 2012-04-28 16:06:36 -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
Dennis Collinson
340411f17c MS DC; admins are now always redirected to new profile 2012-04-24 18:39:09 -07:00
Dennis Collinson
d64eb529d2 MS DC; text now overlays for wallpaper; ALSO. really sorry @danielgrippis stuff does not work in firefox. or safari.
or konqueror. we will talk to him about it later
2012-04-23 17:30:23 -07:00
danielgrippi
75d25e9475 users can now favorite posts 2012-04-22 12:06:15 -07:00