Commit graph

5027 commits

Author SHA1 Message Date
Maxwell Salzberg
8f8769aab5 basic NSFW filtering for authors who say their post is nsfw 2011-12-08 18:22:27 -08:00
Maxwell Salzberg
c0ac664d64 translated close account 2011-12-08 16:32:20 -08:00
danielgrippi
342593988b MS DG; fixed close account cukes 2011-12-08 16:32:20 -08:00
Maxwell Salzberg
90458381f5 basic page for deleting account with temporary text and cute cat picture 2011-12-08 16:32:20 -08:00
Maxwell Salzberg
ee12f19ff6 dispatch before deleting 2011-12-08 16:32:20 -08:00
Ilya Zhitomirskiy
e57698bbe8 setting the account deletion name in the xml 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
1552b5bcc2 keep the pivate key, required for retries 2011-12-08 16:32:19 -08:00
Maxwell Salzberg
f800d50a2b i think this works 2011-12-08 16:32:19 -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
7667029e71 wip, stated the serialized model 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
danielgrippi
e6ed2d397a added close account to user 2011-12-08 16:32:18 -08:00
danielgrippi
cd6f97fa0e DG IZ; remove authorizations from user; double check that aspect_visibilities are deleted 2011-12-08 16:32:18 -08:00
danielgrippi
644e382cfd DG IZ; remove more stuff associated with user; removed dependant destroys 2011-12-08 16:32:18 -08:00
Ilya Zhitomirskiy
3035f173bd ms iz wip, clearing profile, started deleting post visibilities 2011-12-08 16:32:18 -08:00
Ilya Zhitomirskiy
05612ef733 ms iz wip 2011-12-08 16:32:18 -08:00
Maxwell Salzberg
2282fd35d1 kill no longer used youtube titles code with fire 2011-12-08 16:16:57 -08:00
Gonzalo Rodriguez
c7c46d2b7b Update edit form after aspect rename. Closes #2363. 2011-12-07 01:57:04 -02:00
danielgrippi
beeb02dcd6 omniauth 1.0 replaced 'user_info' with 'info' 2011-12-06 17:53:41 -08:00
danielgrippi
d0f58e1bd4 Revert "upgrade devise; devise_invitable"
This reverts commit 0f56ee7b77.
2011-12-06 11:01:50 -08:00
danielgrippi
0f56ee7b77 upgrade devise; devise_invitable 2011-12-06 10:50:29 -08:00
Jonne Hass
a892ea41eb refactor out profile url generation into local_or_remote_person_path and use it everywhere. closes #2471 2011-12-06 13:08:21 +01:00
tmlee
3b6c6c564f Include "Looking For #link" under params[:q] blank else branch 2011-12-03 21:23:39 -02:00
Gonzalo Rodriguez
c62a9a2e63 Little refactor on PeopleController#index 2011-12-03 21:19:58 -02:00
Daniel Grippi
71354a1673 Merge pull request #2469 from geckoxx/comment_stream_new
better commented_posts_stream
2011-12-02 10:42:36 -08:00
Johannes Hackel
36c9b9ecdd fix next sql error 2011-12-02 16:33:12 +01:00
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Kaleem Ullah
afa1274d7c change upload photo alt text 2011-12-01 10:22:35 +04:00
Pistos
aa0aaa2f92 Revert "Merge pull request #2428 from geckoxx/comment_stream"
This reverts commit 8a27568273, reversing
changes made to 31ef2d60f7.

Conflicts:

	app/helpers/stream_helper.rb
	app/views/aspects/index.html.haml
	config/locales/diaspora/en.yml
	config/routes.rb
	spec/lib/stream/comments_spec.rb
2011-11-30 22:22:32 -05: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
Daniel Grippi
5a1b73dc61 Merge pull request #2433 from geckoxx/2274-empty-tag
Fix Bug 2274, empty tag
2011-11-30 09:07:30 -08:00
aboire
d03695e128 update url invitation facebook 2011-11-30 17:44:45 +04:00
Johannes Hackel
23fa7a0a3e like stream new 2011-11-29 17:27:09 +01:00
danielgrippi
873e04f24d Revert "use select distinct as opposed to group by". Using a distinct
causes a 500

This reverts commit 805346c70c.
2011-11-28 15:17:36 -08:00
danielgrippi
805346c70c use select distinct as opposed to group by 2011-11-28 15:09:20 -08:00
Daniel Grippi
161d9d527c Merge pull request #2270 from fermionic/allow-photo-views-in-mobile
re-enable photo viewing on mobile
2011-11-28 11:03:13 -08:00
Daniel Grippi
a4027f3d22 Merge pull request #2417 from jperyl/2284-display-user-handle-in-hovercard-2
Issue #2284: simple fix
2011-11-28 09:32:41 -08:00
Daniel Grippi
8a27568273 Merge pull request #2428 from geckoxx/comment_stream
comment_stream
2011-11-28 09:05:45 -08:00
Vittorio Cuculo
fdd52782d2 show diaspora_handle on profile [mobile] 2011-11-24 09:42:15 +01:00
Johannes Hackel
ef28e89809 people_controller_spec 2011-11-23 23:45:09 +01:00
Jonne Hass
a40fbc9617 Merge pull request #2403 from gandaro/outdated-information-cubbies
deleted tokens:show:login_with_diaspora_is_comming
2011-11-23 13:07:10 -08:00
Michael Sofaer
2b8d07f94b Censorship point has been made ... for now. 2011-11-22 15:54:50 -08:00
Johannes Hackel
66acd7db14 specs, stay on page 2011-11-22 12:54:19 +01:00
Johannes Hackel
eb65074360 Fix Bug 2274, empty tag 2011-11-22 12:16:00 +01:00
Dan Hansen & Sarah Mei
d9bd25e114 Only repopulate cache on contact destroy if user exists 2011-11-21 21:39:26 -08:00
Johannes Hackel
7368bb9e62 comment_stream 2011-11-20 18:37:10 +01:00
Dan Hansen & Sarah Mei
7e4028626f Fix lightbox for non-logged-in user 2011-11-19 21:45:31 -08:00
Sarah Mei
ad27eaac3d Fix photo#show for non-logged-in user 2011-11-19 21:17:39 -08:00
Jake Peryl
07f05ebead Issue #2284: simple fix 2011-11-17 01:22:01 +01:00