Florian Staudacher
024f1fee74
disable jQuery effects for tests
...
... might buy us a few seconds
2012-04-05 16:12:45 +02:00
danielgrippi
59917e95ab
update feature_flagger to have access to current user
2012-04-04 19:35:53 -07:00
Maxwell Salzberg
9c9562d0fd
fix http urls with 3 slashes
2012-04-04 19:08:36 -07:00
danielgrippi
39d688044d
DG DC; visual fixups
2012-04-04 18:59:19 -07:00
danielgrippi
6098890783
redirect to post show on create
2012-04-04 18:59:19 -07:00
danielgrippi
9b02633dff
framer has better styling
2012-04-04 18:59:19 -07:00
Dennis Collinson
06110b8732
newspaper template WIP
2012-04-04 18:59:19 -07:00
Jonne Haß
5866ebe638
using an image tag as a path is an interesting idea... but a path is still working better :P [ci skip]
2012-04-05 03:14:02 +02:00
danielgrippi
59f092c26a
added bootstrap extensions to new-templates [ci skip]
2012-04-04 13:22:44 -07:00
Maxwell Salzberg
d755f03cd0
add two more images to the assets
2012-04-04 13:12:07 -07:00
Maxwell Salzberg
d616e902c9
add favicon back
2012-04-04 13:00:25 -07:00
Maxwell Salzberg
8ef49586c3
update foreman
2012-04-03 23:02:16 -07:00
danielgrippi
3bc3f13651
upgrade backbone, fix tests
...
some cukes may be failing non deterministically, I think, do we bump the cuke timeout?
2012-04-03 16:31:52 -07:00
Maxwell Salzberg
bb5aa2821d
use the built in asset_sync initializer. add a rake task to bootstrap
...
heroku and asset sync, which puts the S3 config vars in from your app
config.
2012-04-03 14:47:33 -07:00
Steven Hancock
a8843c1036
Fix JSON caching regression
...
Disable jQuery's AJAX caching to prevent the browser's
back button from dumping the stream in JSON format.
Includes a test for the jquery_include_tag helper to
ensure that the necessary line of javascript doesn't
go missing again.
closes #3094
2012-04-02 21:40:16 -07:00
danielgrippi
e156947d0b
fix jasmine specs
2012-04-02 18:17:55 -07:00
Daniel Grippi
6f75fb4173
Merge pull request #3088 from Raven24/fix-bmm-2
...
show an error message when creating a comment failed [ci skip]
2012-04-01 18:24:54 -07:00
Daniel Grippi
a45eed13d5
Merge pull request #3086 from Raven24/fix-publisher-height
...
reset publisher css height when "cleared" [ci skip]
2012-04-01 18:24:00 -07:00
Florian Staudacher
ef292c40eb
create a dummy-participation object, that the post appeas followed by self
2012-04-01 22:34:54 +02:00
Jonne Haß
a5a6378eb0
translate 'mark unread' in notifications badge
2012-04-01 13:03:44 +02:00
Maxwell Salzberg
0e2bcf18d2
the logged out logo is now in the branding folder
2012-03-31 00:15:55 -04:00
Florian Staudacher
e6ebf4ad62
show error message when creating a comment failed
...
(e.g. when the post got deleted in the meantime)
bug mash 5.2
2012-03-30 19:42:14 +02:00
Florian Staudacher
859c0b93b5
reset publisher css height when "cleared" ( fixes #2867 )
2012-03-30 16:09:41 +02:00
Steven Hancock
fc4b8d2af0
Skip CSRF token for OmniAuth callbacks (prevents session reset)
...
OmniAuth callbacks need to accept a raw POST from the auth provider without
verifying the CSRF token, otherwise the session will be reset.
See intridea/omniauth#203
See also http://www.communityguides.eu/articles/16
(This technique will also be needed for API endpoints when the time comes)
2012-03-29 18:51:54 -07:00
Maxwell Salzberg
b0a9e9ee59
the header background is not in the branding folder [ci skip]
2012-03-29 16:46:08 -07:00
Raven24
5ad38a5372
damn my brain!
2012-03-30 01:50:21 +03:00
Maxwell Salzberg
033bf637cd
Merge pull request #3070 from SuperTux88/fix-invite-mail
...
Fix invite mail NOTICE: MIGRATION ON USERS INCLUDED!
2012-03-29 15:41:23 -07:00
Maxwell Salzberg
7cc63348ce
Merge pull request #3080 from Raven24/js-fix
...
fix js error when not logged in and on root/landing page, app is undefined
2012-03-29 15:40:15 -07:00
Maxwell Salzberg
a08711c74e
Merge pull request #3083 from DeadSuperHero/branding-pack
...
Branding Pack [ci skip]
2012-03-29 15:39:58 -07:00
Maxwell Salzberg
fe1c0d34d5
Merge pull request #3084 from Raven24/non-ascii-begone
...
finally (hopefully) fix non-ascii urls + new & old tests
2012-03-29 15:35:48 -07:00
Florian Staudacher
ae3e225e28
finally (hopefully) fix non-ascii urls + new & old tests
2012-03-30 00:29:34 +02:00
Sean Tilley
19bf699b9f
Move branding assets to /images/branding for asset pipeline, update template files to point to new branding directory
2012-03-29 17:18:27 -05:00
Dennis Collinson
59f7f504e8
Wallpaper Mood
2012-03-29 15:14:09 -07:00
Maxwell Salzberg
52c9d76a86
Merge pull request #3065 from diasp/2176-url-in-rss
...
Make URL clickable in RSS #2176
2012-03-29 12:18:36 -07:00
Dennis Collinson
6488cd004b
Disable Mentions in trumpeter to fix cukechange assertion of mood
2012-03-29 12:16:59 -07:00
Maxwell Salzberg
79a09dbea6
Merge pull request #3069 from movilla/trad_mobile
...
Small translations of mobile "My Activity" and add translation "via mobile" for mobile posts
2012-03-29 12:14:35 -07:00
Florian Staudacher
9d3f221f1a
fix the js error when not logged in and on root/landing page, app is undefined
2012-03-29 16:28:53 +02:00
movilla
af10497b6c
Add translation via mobile
2012-03-29 17:26:03 +03:00
Steven Hancock
6abe718227
Mobile UI fixes
...
This fixes issues with mobile UI rendering
Issues fixed:
* vendor/bootstrap.css and vendor/bootstrap-responsive.css need to
be precompiled for the mobile UI to render properly
* Rails 3.1 is more strict about layout fallbacks, the single-post
view in the mobile UI needs to have the "application" layout
specified to render properly
2012-03-29 05:52:45 -07:00
Diaspora Europe
9fdca1adf8
make URL clickable in RSS #2176
2012-03-29 13:43:04 +02:00
Steven Hancock
77b107831b
punycode.js is required by our javascript
...
The punycode.js file was somehow removed from the repo. This
replaces it with the current version from github and adds it
to our main.js manifest. Our javascript requires punycode for
(at least) stream rendering.
2012-03-28 20:03:00 -07:00
Dennis Collinson
a9c0c4098b
add bootstrap dropdown
2012-03-28 19:13:51 -07:00
Dennis Collinson
755ff52452
turn asset pipeline debugging off
...
there was a collision with the aspects-dropdown view in the new
publisher, also
it takes too much time with it on
2012-03-28 19:01:44 -07:00
Dennis Collinson
875ce68556
fixes for jasmine
2012-03-28 16:32:24 -07:00
Dennis Collinson
78a2ed28b9
User can select Night and Day Moods
...
headline method on post
extract headline and body from post, at first newline
Night Mood
2012-03-28 16:22:05 -07:00
Dennis Collinson
f25effcafe
move handlebars templates for asset pipeline
2012-03-28 16:21:30 -07:00
Maxwell Salzberg
0ce0f3ca74
NOTE: DO NOT PULL THIS ON PRODUCTION TILL FURTHER NOTICE asset pipeline
...
WIP Merge branch 'rebased-asset-pipeline'
2012-03-28 14:52:55 -07:00
Maxwell Salzberg
402694e516
fixing cukes
2012-03-28 14:47:28 -07:00
Maxwell Salzberg
5dbfd89d93
some more fixes for the show pages
2012-03-28 13:56:52 -07:00
Maxwell Salzberg
283e730430
AHHH CRAZY. stupid branchs. WIP
2012-03-27 18:40:02 -07:00
