Pistos
aa0aaa2f92
Revert "Merge pull request #2428 from geckoxx/comment_stream"
...
This reverts commit 8a2756827331ef2d60f7
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
danielgrippi
cc4531f73c
stop censorship. sopa
2011-11-16 16:04:21 -08:00
Jonne Hass
565ef69441
translate Email in the sidebar
2011-11-16 21:55:09 +01:00
Jonne Hass
74582fe07d
Merge pull request #2340 from manuels/userignore_icon
...
Modified "Ignore user" icon
2011-11-16 10:48:55 -08:00
Jonne Hass
09bad3a7f6
Merge pull request #2314 from Pistos/svg-to-png
...
Converted all [used] SVG graphics to PNG.
2011-11-16 10:45:33 -08:00
Jakob Kramer
3f3dbf0c6c
deleted tokens:show:login_with_diaspora_is_comming, because it got outdated by now
2011-11-15 14:42:47 +01:00
danielgrippi
8e55fc158b
use root_path in header if not logged in
2011-11-14 19:04:27 -08:00
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
Michael Sofaer & Sarah Mei
8294472420
Merge branch 'master' of https://github.com/diaspora/diaspora
2011-11-14 14:16:20 -08:00
Michael Sofaer & Sarah Mei
3e1d06ded3
Memorial splash page
2011-11-14 14:16:09 -08:00
Kevin Fitzpatrick & Tim Frazer
84e4866e6b
Merge branch 'master' of github.com:diaspora/diaspora
2011-11-14 12:33:10 -08:00
Kevin Fitzpatrick & Tim Frazer
96f2aaa57a
Background sending password reset instructions.
2011-11-14 12:30:47 -08:00
Jonne Hass
226554becf
auto follow back feature
2011-11-14 20:25:11 +01:00
Pistos
05b1e2fc19
Fixed issue #2380 : No more 500 error when following an unnormalized version of an existing tag.
...
e.g. if "test" exists and you try to follow "Test".
2011-11-13 23:26:53 -05:00
Jonne Hass
6526e2f305
fix #2392
2011-11-13 22:37:18 +01:00
Jonne Hass
9839ac559c
fixed timeago for posts#show if not logged in
2011-11-11 23:06:08 +01:00
Jonne Hass
65f8136690
made public translatable in the publisher dropdown
2011-11-11 23:00:46 +01:00
Pistos
ef075b7b15
Don't render "getting started" help text over aspect dropdown if the user isn't actually getting started.
...
This fixes a UI bug which showed remnants of the "getting started" text on hover.
2011-11-10 20:41:09 -05:00
Pistos
d3d92e5957
Only render "getting started" help text for users that really are getting started.
...
This fixes a UI bug which showed remnants of the "getting started" frontend code on hover.
2011-11-10 20:04:26 -05:00
Pistos
ef990e04cd
Refactor new user helper text in publisher; improved code readability.
2011-11-10 20:03:52 -05: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
Lennart Prelle
d95b28a9be
added translation to tag_path in _right_selection
2011-11-10 15:14:07 +01:00
Daniel Grippi
6c68fd752f
Merge pull request #2362 from Pistos/remove-invalid-comment-in-publisher
...
Remove a comment from the publisher Haml code, so publisher isn't mangled
2011-11-09 16:33:37 -08:00
Daniel Grippi
319d72deb9
Merge pull request #2345 from 21echoes/higher_post_limit
...
higher post limits
2011-11-09 16:11:39 -08:00
Daniel Grippi
eb6fc5f130
Merge pull request #2367 from lprelle/newhere_to_locale_translation
...
#NewHere to locale translation
2011-11-09 16:09:12 -08:00
Jason Robinson
c04bcebfca
Bookmarklet render if statement negated for code simplicity
2011-11-09 22:44:57 +02:00
