danielgrippi
eaed3505e4
Don't create share_visibilities for public posts, sans migration of deleting old data.
2012-01-24 16:49:07 -08:00
Daniel Grippi
89472992cc
Merge pull request #2720 from MrZYX/people_slash_guid
...
use guid instead of id for /people/ urls
2012-01-24 13:14:08 -08:00
Jonne Haß
19785d909b
ensure services is an array in StatusMessagesController#create
...
This fixes posting to a single service for Ruby 1.9
For some reason Rails doesn't convert a single foo[]=bar
not to the expected :foo => ["bar"] but to :foo => "bar"
On Ruby 1.8 String#map exists and just yields self, on
Ruby 1.9 String#map got removed
2012-01-24 18:54:36 +01:00
Dennis Collinson
f506a8778c
moving javascript hax
2012-01-23 19:32:15 -08:00
Dan Hansen
51332931ee
almost done
2012-01-23 19:31:01 -08:00
Jonne Haß
7aaaf4f43b
use guid instead of id for /people/ urls
2012-01-23 23:35:31 +01:00
danielgrippi
8f38a19976
stray underscore reference in handlebars template [ci skip]
2012-01-23 10:27:37 -08:00
Jonne Haß
12575bd7f0
update http_accept_language and try to find the preferred locale first, should fix #2715
2012-01-23 14:59:09 +01:00
danielgrippi
c94cc1cef2
markdown text in comments (auto linking, etc). we can use {{{ }}} notation here because markdown strips out xss, etc.
2012-01-23 00:57:05 -08:00
danielgrippi
bf5538d035
convert header template from underscore to handlebars [ci skip]
2012-01-23 00:40:19 -08:00
danielgrippi
0a670ccf8a
convert comment underscore template to a handlebars template.
2012-01-22 23:37:13 -08:00
danielgrippi
3a76490640
window.app.user() doesn't return attributes nested in a key; added a comment_view spec
2012-01-22 23:37:13 -08:00
danielgrippi
778683f3e3
don't extend helpers in the notifications index view; make notification_count and unread_message_count controller helper methods (now that we're not using vanna)
2012-01-22 22:26:27 -08:00
Daniel Grippi
2c50de0726
Merge pull request #2714 from stwf/im-sorry-bye-vanna
...
Remove Vanna Controller from app and fix up notifications controller, views, scripts, specs
2012-01-22 22:15:14 -08:00
danielgrippi
9510e1ca6f
i mustache you a question, but i'll shave it for you later.
2012-01-22 22:01:57 -08:00
danielgrippi
5d15c53f6b
Revert "Revert "now using handlebars for client side templates" for now"
...
This reverts commit 5f9c469b12
2012-01-22 22:01:57 -08:00
Sarah Mei
5bd929b697
Remove references to GetSatisfaction
2012-01-22 20:46:13 -08:00
Steven Fuchs
7cbcaafbeb
oops, application_helper gone from application_controller.
2012-01-22 23:28:55 -05:00
Steven Fuchs
052690941b
move set_header_data back into application_controller
2012-01-22 23:23:21 -05:00
Dennis Collinson
5f9c469b12
Revert "now using handlebars for client side templates" for now
...
This reverts commit 4692055d8a
2012-01-22 17:16:22 -08:00
Dennis Collinson
4692055d8a
now using handlebars for client side templates
2012-01-22 16:59:44 -08:00
Steven Fuchs
e882dedd33
remove vanna controller from app, adjust scripts, specs, views and controllers to work.
2012-01-22 17:39:35 -05:00
danielgrippi
740cedde44
temporarly remove newrelic_ignore in PublicsController for heroku analysis
2012-01-22 14:12:24 -08:00
Sarah Mei
872a96dc71
Refactor services controller spec
2012-01-22 08:28:23 -08:00
Jonne Haß
ebfc3de878
do not require newrelic or airbrake unless they are configured
2012-01-22 15:38:55 +01:00
Jonne Haß
c8e09bf325
localize back to top [ci skip]
2012-01-22 13:54:31 +01:00
Jonne Haß
a53b1ccaae
remove stray :A, thanks @aia
2012-01-22 13:50:36 +01:00
Maxwell Salzberg
50e8e90066
add basic nsfw for mobile. fixes #2709
2012-01-22 01:56:16 -08:00
danielgrippi
cc1ac843cc
re-added widget; fixed tests; use _.throttle instead of depricated custom debounce
2012-01-21 20:23:00 -08:00
danielgrippi
7ef70b9090
collapse reshare text [ci skip]
2012-01-21 19:02:58 -08:00
danielgrippi
c3b9bb9a9a
expanding likes works again
2012-01-21 18:55:07 -08:00
danielgrippi
8b4f0473a7
mobile header gradient reflects the desktop gradient; added background texture to mobile
2012-01-21 15:19:06 -08:00
MrZYX
1ab9520b36
generate recipient header with Mail::Address to properly handle non-ASCII characters
2012-01-21 19:16:09 +01:00
Maxwell Salzberg
e461956a97
allow custom app_name prefixes for newrelic
2012-01-20 12:25:05 -08:00
Steven Fuchs
9836860ca3
Merge remote branch 'upstream/master' into im-sorry-bye-vanna
2012-01-20 12:23:45 -05:00
danielgrippi
750e26e8fb
Merge branch 'stream-js-cleanup'
...
Conflicts:
public/javascripts/app/models/stream.js
2012-01-19 17:07:17 -08:00
danielgrippi
c219cee97d
fix inf scroll issues in stream view
2012-01-19 17:01:45 -08:00
Maxwell Salzberg
642d20cecd
update cdn jquery, fix #2699
2012-01-19 15:48:17 -08:00
Maxwell Salzberg
0ce0e47ff8
fix #2698 ; allow a user to delete a reshare of a deleted post
2012-01-19 15:24:07 -08:00
danielgrippi
5721c9e512
remove depricated methods
2012-01-18 13:29:43 -08:00
danielgrippi
c82ac5f3e2
fix collapsing of posts [ci skip]
2012-01-18 12:40:33 -08:00
Maxwell Salzberg
254860bddc
SM MS; Read email sent to diaspora-dev for more information about this
...
commit. Add migration and rake task to copy hidden information from
share_visibilities to users. see: http://devblog.joindiaspora.com/?p=44
2012-01-17 19:29:01 -08:00
danielgrippi
a658552c3f
fix stream helper for mobile
2012-01-17 19:21:36 -08:00
danielgrippi
641ca9fdd2
we want to POST to /status_messages on Publisher submit
2012-01-17 17:46:49 -08:00
Maxwell Salzberg
b09e76a0ce
introduce base_pod_uri, so we can support domains that use www and [bare] with webfinger
2012-01-17 17:34:42 -08:00
Steven Fuchs
36fd43db4c
incorporated improvements from @maxwell from last pull request.
2012-01-17 19:27:48 -05:00
Steven Fuchs
aae5fe04ce
css for marking as unread, and hook for notification page to be part of it when called.
2012-01-17 19:21:25 -05:00
danielgrippi
fdc0b681eb
remove unused api serializers (cruft)
2012-01-17 16:03:24 -08:00
danielgrippi
339c47d782
moved stream logic into its own controller (StreamsController)
2012-01-17 15:53:06 -08:00
danielgrippi
bfe0b7129c
move all stream actions into PostController
2012-01-17 15:53:06 -08:00
