Florian Staudacher
b5a53c03d7
when using system ruby, we might need sudo [ci skip]
2012-05-20 22:46:07 +02:00
Florian Staudacher
67dd49b1e4
... wait for it ...
2012-05-20 22:44:50 +02:00
Maxwell Salzberg
bde23f8ab8
use image_tag for asset_pipeline goodness
2012-05-19 18:19:50 -07:00
Jonne Haß
ccf3bc36f2
updated 20 locale files [ci skip]
2012-05-20 00:36:31 +02:00
Florian Staudacher
9b563e39da
fix login cukes
2012-05-19 22:29:12 +02:00
danielgrippi
72f718c8c3
new login page. kept the old one for safe keeping.
2012-05-19 11:10:17 -07:00
Florian Staudacher
a49fe03bd8
use schema instead of migrations for installer [ci skip]
2012-05-19 18:24:13 +02:00
Steven Hancock
125b013c10
AppsController no longer exists
...
Remove the AppsController check from the next_page_path helper, since
AppsController no longer exists.
fixes #3280
I'd like to write a helper spec for this, but it'll probably require
some stubbing/mocking and I'm a little too tired to deal with that at
the moment.. so for now let's just fix the problem. :)
2012-05-18 23:42:29 -07:00
danielgrippi
f4c06c8f88
add rounded buttons to the composer flow; slay multi-photo option
2012-05-18 19:46:51 -07:00
Maxwell Salzberg
593fa0ed8e
stupid hack for photos
2012-05-17 21:49:04 -07:00
danielgrippi
72bb37d79d
removed typo in travis.yml
2012-05-17 19:05:27 -07:00
danielgrippi
62ba75ad1b
DG DC; Move stuff to second page of framer
2012-05-17 19:02:58 -07:00
Maxwell Salzberg
58e4c3614b
update travis.yml to reflect reality [ci skip]
2012-05-17 18:53:03 -07:00
Maxwell Salzberg
d069865c42
upgrade carrierwave to 0.6.2
2012-05-17 18:51:12 -07:00
Maxwell Salzberg
20a63e3497
make the jquery can default to false in development and test so test can run offline [ci skip]
2012-05-17 18:50:51 -07:00
Maxwell Salzberg
64dae868fe
fix some tests around pubsubhubub
2012-05-17 18:23:40 -07:00
Maxwell Salzberg
133c9ee0c3
remove deprecation warnings about the template handler in rails 3.2
2012-05-17 18:23:39 -07:00
Maxwell Salzberg
af1109dcf7
remove a couple more stray files we dont use anymore, and remove rest-client
2012-05-17 18:23:39 -07:00
Maxwell Salzberg
86c0a62373
Merge pull request #3276 from stevenh512/refactor-emails
...
Render invitation email without a layout
2012-05-17 18:21:18 -07:00
Steven Hancock
2ae366ad19
Render invitation email without a layout
...
Ideally, we'll probably want to add a layout for this email at some point,
but this simplifies it to the bare minimum and gets rid of the "click here
to change your notification settings" link.
fixes #3270
2012-05-17 17:51:20 -07:00
danielgrippi
27aff7fb1e
DG DC; GREEEEEEEEEN
2012-05-17 17:01:31 -07:00
Maxwell Salzberg
973d6d9e8b
Merge pull request #3275 from diaspora/reshare-root
...
resolve reshare authors to the first one
2012-05-17 16:51:52 -07:00
Florian Staudacher
788f328a77
resolve reshare root posts to the first one
2012-05-18 01:45:41 +02:00
Dennis Collinson
c66bd9d6d8
fix posting with services, fix cuke
2012-05-17 15:32:35 -07:00
Dennis Collinson
00f1adc8b2
Going back to the composer from the framer is happy via button
2012-05-17 15:32:35 -07:00
Maxwell Salzberg
a28c90f7b9
Merge pull request #3266 from diaspora/new-webmock
...
updated webmock, hopefully fix cucumber
2012-05-17 15:27:25 -07:00
Florian Staudacher
fd5aedeb01
updated webmock, hopefully fix cucumber
2012-05-18 00:21:04 +02:00
Maxwell Salzberg
f24b1f1550
remove a bunch of unused assets [ci skip]
2012-05-17 15:14:51 -07:00
Maxwell Salzberg
471ce309ea
kill your darlings; remove diaspora_client with fire
2012-05-17 14:55:53 -07:00
Maxwell Salzberg
69d81951a5
wip
2012-05-17 14:55:22 -07:00
Maxwell Salzberg
b55c2ab956
update heroku san to be an official version
2012-05-17 14:27:51 -07:00
danielgrippi
c8aa67360b
backfill some tests; jasmine green
2012-05-17 13:31:40 -07:00
Maxwell Salzberg
3cdc2fc03b
Merge pull request #3273 from Raven24/fed_loggr_speedup
...
make federation logger db creation faster by not migrating but using the schema instead
2012-05-17 12:42:13 -07:00
Florian Staudacher
49117cc95f
make federation logger db creation faster by not migrating but using the schema instead
2012-05-17 21:13:23 +02:00
danielgrippi
e48d57b19b
Revert "DC fix back button to profile with this.deferred reference"
...
This reverts commit e5206f3429
2012-05-17 12:05:45 -07:00
danielgrippi
e5206f3429
DC fix back button to profile with this.deferred reference
2012-05-17 11:47:17 -07:00
danielgrippi
ed6785d7cb
don't use an iframe for the composer anymore. yayyyyy
2012-05-16 18:55:25 -07:00
Maxwell Salzberg
a6758c0832
Merge pull request #3264 from movilla/share_amparito
...
Translation invitation Share this link /stream [ci skip]
2012-05-16 17:48:14 -07:00
Maxwell Salzberg
b124d3e5a1
Revert "update factory girl" new version does not support 1.8.7 :(
...
This reverts commit c52342b7cb
2012-05-16 17:43:56 -07:00
Maxwell Salzberg
c52342b7cb
update factory girl
2012-05-16 17:17:14 -07:00
Maxwell Salzberg
455dc34eae
remove hotlink controller, just rewrite those landing assets
2012-05-16 15:02:59 -07:00
Maxwell Salzberg
143df27e5a
redirect old atom.xml :( [ci skip]
2012-05-16 14:48:01 -07:00
danielgrippi
08fddf7422
raise on hotlinking [ci skip]
2012-05-16 14:41:09 -07:00
Florian Staudacher
bdf7dba42e
update ruby version, be more verbose while installing, load .rvmrc the hard way
2012-05-16 16:11:04 +02:00
danielgrippi
ebbbf74489
add 1.9.3 back into the gemfile. LETS DO THIS [ci skip]
2012-05-15 17:19:28 -07:00
danielgrippi
fb0fa46613
whoops (gemfile) [ci skip]
2012-05-15 17:10:44 -07:00
movilla
d394272e5d
Translation invitation Share this link /stream
2012-05-16 00:56:34 +02:00
Maxwell Salzberg
4d9df0ec25
Merge pull request #3263 from movilla/stats_amparito2
...
[Rebase] Add translation app/views/admins/stats.html.haml for Admin Panel [ci skip]
2012-05-15 15:52:39 -07:00
danielgrippi
15eab43408
explicitly set ruby version in gemfile [ci skip]
2012-05-15 14:40:00 -07:00
danielgrippi
f9bc493581
remove 1.9.3 from heroku env [ci skip]
2012-05-15 14:26:42 -07:00
