Dennis Collinson
18cd151456
cuke fix
2012-01-23 19:32:15 -08:00
Dennis Collinson
f506a8778c
moving javascript hax
2012-01-23 19:32:15 -08:00
Dennis Collinson
870ad3d9f7
DC DG; some fixes, mentioning works.
2012-01-23 19:32:15 -08:00
Dan Hansen
51332931ee
almost done
2012-01-23 19:31:01 -08:00
Dan Hansen
e169879311
remove jquery.elastic dependency
2012-01-23 19:31:00 -08:00
Dan Hansen
3b4e3fd87e
mentions now work for stream publisher
2012-01-23 19:31:00 -08:00
danielgrippi
94ad9264f1
DG DH; wip
2012-01-23 19:31:00 -08:00
Dan Hansen
168d6cbdbe
jquery.mentionsInput wip, almost done
2012-01-23 19:31:00 -08:00
Maxwell Salzberg
c073cb078f
update messagebus gem
2012-01-23 16:29:19 -08:00
Jonne Haß
a19736e0c4
d'oh committed db/schema.rb
2012-01-23 23:45:15 +01: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
Steven Fuchs
d8f2e73ea2
refer to model for target value, not set attributes.
2012-01-23 12:05:43 -05: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
Jonne Haß
6befd552d0
gitignore page caches [ci skip]
2012-01-23 12:20:42 +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
Maxwell Salzberg
5b947db0d7
remove a couple of stray things I mistakenly -am -ed in. also, I am a jerk
2012-01-22 23:07:26 -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
Maxwell Salzberg
25a15259bc
explicitly require airbrake middleware if it is configured.... i should not have to do this however
2012-01-22 11:06:18 -08:00
Jonne Haß
1d8dbdd8d8
the middleware stack is just an array and insert_before just an alias to insert, basically, guess what inset(0, something) does. AKA finally fix Rack:SSL
2012-01-22 19:20:35 +01:00
Jonne Haß
98bdf68003
do not rely on hoptoad to insert rack ssl
2012-01-22 18:42:06 +01: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
Florian Staudacher
729f815736
checkbox labels should now be where they're supposed to (they were color:#CCC before, I left them #222 for now)
...
also labels are font-weight:normal and a little smaller since they seemed very dominant compared to the input fields (if not desireable, just remove font-size:.96em)
are there any more inputs I don't (yet) know about...?
2012-01-22 15:18:11 +01:00
Jonne Haß
7fd606ba19
Merge branch '2688-airbreak' of https://github.com/fred/diaspora
...
Conflicts:
config/application.yml.example
2012-01-22 15:05:37 +01:00
Florian Staudacher
363ca8c07e
Merge branch 'master' of git://github.com/diaspora/diaspora into input-placeholders
2012-01-22 14:42:45 +01:00
Jonne Haß
54cb3ea3cb
more than 100% height <3, fix #2710 [ci skip]
2012-01-22 14:01:21 +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
Maxwell Salzberg
49f18d435a
upgrade factory girl there are 3 failing cukes.
2012-01-21 21:58:50 -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
Jonne Haß
b831a9b4db
Merge pull request #2706 from dmorley/patch-10
...
Update config/assets.yml
2012-01-21 07:56:37 -08:00
