danielgrippi
6be778b9b2
change root_path and root_url to multi_path
2011-11-14 18:01:09 -08:00
danielgrippi
6408105917
Revert "auto follow back feature"
...
This reverts commit 226554becf
2011-11-14 17:18:43 -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
Jonne Hass
226554becf
auto follow back feature
2011-11-14 20:25:11 +01:00
Jonne Hass
6526e2f305
fix #2392
2011-11-13 22:37:18 +01: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
Jonne Hass
10fa7ba024
fixed 500 on photos#show for private photos and logged out user
2011-11-10 19:31:00 +01:00
Jason Robinson
c04bcebfca
Bookmarklet render if statement negated for code simplicity
2011-11-09 22:44:57 +02:00
Jason Robinson
af5c469f10
Created missing view for mobile bookmarklet. Adjusted status_messages_controller.rb to render it.
2011-11-09 22:44:57 +02:00
danielgrippi
de88c0ab48
correct newrelic_ignore
2011-11-06 19:35:30 -08:00
Pistos
14842c1b43
Merge remote-tracking branch 'johnedmonds/issue1144'
2011-11-06 22:21:53 -05:00
Sarah Mei
c2893a2e3d
Fix require problem with the acts_as_taggable patches
2011-11-05 22:38:14 -07: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
Jonne Hass
9ee3b2d080
improved closing account experience and fixed the cuke
2011-11-05 11:30:21 +01:00
Sarah Mei
d17ecd6101
Fix user controller spec
2011-11-04 22:06:56 -07:00
Ilya Zhitomirskiy
f3183a11e1
message explaining that we're populating things in the background
2011-11-04 16:20:51 -07: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
bb19531195
require newrelic_rpm if newrelic is configured
2011-11-03 18:06:32 -07:00
danielgrippi
dca370d3ff
ignore publicscontroller in newrelic
2011-11-03 14:45:46 -07:00
danielgrippi
b56dc9205b
added ignore text on user pages if it applies
2011-11-03 12:31:25 -07:00
danielgrippi
0ab23f337a
fixed all cukes; view bugs on streams
2011-11-03 12:31:24 -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
ee5bc25faf
DH DG; don't display blocked people in stream; switch controls in stream; disallow blocking yourself
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
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
Lennart Prelle
f2123d942d
make language for email-invitation available
2011-10-31 21:11:47 +01:00
Ilya Zhitomirskiy
82fabbadd1
Revert "remove sort order option from the stream (commented at is too crazy and way to slow on large data sets)"
...
This reverts commit 95aac2f352
2011-10-31 12:38:00 -07:00
danielgrippi
95aac2f352
remove sort order option from the stream (commented at is too crazy and way to slow on large data sets)
2011-10-30 21:46:23 -07:00
danielgrippi
0def71d74f
add some feedback text & animation; added spec for collapsing tags
2011-10-27 19:57:00 -07:00
danielgrippi
b879070744
avatars for likes
2011-10-26 23:50:01 -07:00
Maxwell Salzberg
9789e25c99
fix oembed spec; prevent people from commenting on posts that wont federate
2011-10-26 17:32:27 -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
f204910aa4
add 'mark all as read' on notification dropdown
2011-10-25 17:33:57 -07:00
danielgrippi
9fba69cd5b
added person stream; temp hack for photos
2011-10-25 16:29:45 -07:00
danielgrippi
28e08fb6a3
show actual screenshots of diaspora mobile on logout; supress log out flash message; bootstrap on logged out page (can we get d* shots in wp7 and android emulators?)
2011-10-24 20:51:16 -07:00
Maxwell Salzberg
d5e3033308
make a setting to check out the new getting started
2011-10-24 17:10:36 -07:00
danielgrippi
1bc637d83f
new getting started works, needs more love
2011-10-24 14:11:35 -07:00
danielgrippi
547d7e4f8c
bootstrapped getting started page
2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
e7584261c7
removeing the tooltips after submit
2011-10-24 14:11:35 -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
ee74948863
wip welcome post, publisher object
2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
bfd2d440d1
ajax form on the getting started
2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
80216cb024
wip save on blur
2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
c7838debcf
creating multiple tag_followings
2011-10-24 14:11:34 -07:00
Maxwell Salzberg
4022ff5163
small possible fix for conversations
2011-10-24 13:06:32 -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
