Florian Staudacher
80511d065b
don't block stdin when using install script [ci skip]
2012-05-10 17:54:43 +02:00
Florian Staudacher
e0e8b47cb4
see, if this fixes those nasty cuke timeouts
2012-05-10 13:57:26 +02:00
Maxwell Salzberg
eaedfc9827
create a new publisher using the new composer. only for beta users
2012-05-09 16:55:33 -07:00
danielgrippi
a46e16cbcf
delegate frame_name in reshares
2012-05-09 16:37:28 -07:00
Florian Staudacher
4fdb6bd9b7
use post cuke step instead of old skool steps
2012-05-10 00:16:50 +02:00
Florian Staudacher
b1dac3e216
don't test for opacity but for the selector
2012-05-09 22:16:40 +02:00
Florian Staudacher
0aa845f87e
hopefully fix another weirdly fluctuating test failure
2012-05-09 21:25:06 +02:00
Steven Hancock
4c644c336b
Actually only load rails admin in production mode
...
This is what I think 28f8db51e7😁
This only loads rails admin in production and excludes it from
all other environments. Also keeps non-admins out of /admin_panel
(without the initializer it was free-for-all) and temp fixes #3210
until a new gem is released.
2012-05-09 11:46:18 -07:00
Daniel Grippi
1207ded0ea
Merge pull request #3227 from tsujigiri/debugger
...
adding 'debugger' gem to Gemfile [ci skip]
2012-05-09 11:32:45 -07:00
danielgrippi
1791d6b1b8
defer the optimistic loading of profile wallpaper and title (at least wait until the call stack is emptied) [ci skip]
2012-05-09 00:46:40 -07:00
danielgrippi
b641cddb65
eagerly call isotope before images are loaded; optimistically assume wallpaper is in the cache until we actually fix the issue [ci skip]
2012-05-09 00:36:14 -07:00
danielgrippi
62829aee85
remove obnoxious box-shadow transition on hover; transition on transform [ci skip]
2012-05-09 00:24:28 -07:00
Helge Rausch
6b3ba24705
cleaning up in the debugger corner
2012-05-09 08:13:30 +02:00
Helge Rausch
b71f380f5d
Merge branch 'master' into debugger
...
Conflicts:
Gemfile.lock
2012-05-09 07:58:45 +02:00
Dennis Collinson
93afe6d63c
rescue update services on login
...
was failing in development
2012-05-08 20:38:45 -07:00
Daniel Grippi
be43806ef9
Merge pull request #3245 from SuperTux88/fix-publisher-for-beta
...
Fix new publisher if user is beta
2012-05-08 18:42:55 -07:00
Benjamin Neff
1bc1dc4334
Fix new publisher if user is beta
2012-05-09 03:33:50 +02:00
danielgrippi
f053b71c87
add title to service icons. yay. [ci skip]
2012-05-08 18:28:31 -07:00
danielgrippi
5d92d2464b
fix email spec; nokogiri needs a top-leve element
2012-05-08 18:21:38 -07:00
danielgrippi
0ec364e44c
DG MS; popup on services, inlined in the composer
2012-05-08 18:09:33 -07:00
Maxwell Salzberg
c8f3bb3e9b
small typo in notifier.rb
2012-05-08 10:42:24 -07:00
Maxwell Salzberg
1735a17e83
Merge pull request #3241 from stevenh512/nsfw-reshares
...
Reshares delegate nsfw to the root post
2012-05-08 10:06:03 -07:00
Maxwell Salzberg
ab981d4339
Merge pull request #3225 from stevenh512/refactor-emails
...
Use Markerb for emails
2012-05-08 10:02:13 -07:00
Maxwell Salzberg
3a6f32e2d7
Merge pull request #3240 from pubis/update-federation-logger
...
Update federation logger
2012-05-08 10:01:00 -07:00
Jonas Lundqvist
324663e4b4
match integration pod ports
2012-05-08 12:42:12 +02:00
Jonas Lundqvist
501c4aa31e
seperate and move redis dump files so they don't mess with installed redis
2012-05-08 12:41:57 +02:00
Jonne Haß
d444a1dc56
updated 47 locale files [ci skip]
2012-05-08 12:21:45 +02:00
Steven Hancock
605b418d42
Reshares delegate nsfw to the root post
...
fixes #3120
2012-05-08 03:20:01 -07:00
Jonas Lundqvist
819bb95dbd
reorder so integration2 connects to correct redis port
2012-05-08 11:20:56 +02:00
Jonas Lundqvist
436ec039c8
remove debug_rjs reference
2012-05-08 11:20:42 +02:00
Maxwell Salzberg
00123c0ab2
update unicorn [ci skip]
2012-05-08 00:05:09 -07:00
Maxwell Salzberg
ddb7c2c9b0
gah attempt tp fix some stupid tests :/
2012-05-07 23:20:56 -07:00
Maxwell Salzberg
f7205bdf18
sad panda. selenium web driver had to update, and clearly some of the behavior around send_key changed :(
2012-05-07 19:55:42 -07:00
Maxwell Salzberg
b375182e0c
let line breaks work but don't push everything down on the stream [ci skip]
2012-05-07 19:53:47 -07:00
Steven Hancock
56db268613
Use markerb for emails
...
* Add markerb to the Gemfile
* Update mailer classes to send multipart text+html emails
* Simplify all email templates and convert to Markdown+ERB
This required stripping the CSS and images from the emails. All
Markdown templates are based on the original HTML version except
for the inviter, where it was much easier to work with the text
version (and the i18n contains the whole message anyway).
2012-05-07 19:41:30 -07:00
Maxwell Salzberg
3e78dd702b
be really pedantic about the stupid service selector spec
2012-05-07 19:28:14 -07:00
Maxwell Salzberg
4c7e82fec9
derp; find always returns the first element in capybara
2012-05-07 18:56:30 -07:00
Maxwell Salzberg
4b363548a2
update selenium-webdriver for ff12
2012-05-07 18:25:05 -07:00
Dennis Collinson
d1d99d5dd4
Jamie Cai DC refactor isOwnProfile, fix tests
2012-05-07 17:53:37 -07:00
danielgrippi
cb2c972cee
Merge branch 'master' of github.com:diaspora/diaspora
2012-05-07 16:41:29 -07:00
Dennis Collinson
1c135b61fd
Jamie Cai DC message in profile when user has no posts
2012-05-07 15:56:30 -07:00
Maxwell Salzberg
fcd67ebc77
fix build
2012-05-07 15:55:34 -07:00
Maxwell Salzberg
7d0f79c29b
fix pg rspec
2012-05-07 15:43:53 -07:00
danielgrippi
34819b4128
temp button instead of textbox for beta-limbo users
2012-05-07 15:40:13 -07:00
danielgrippi
6e16a748e7
unfix css styling in one place; fix it in another [ci skip]
2012-05-07 15:13:27 -07:00
danielgrippi
c31413e73c
green build = happy dan
2012-05-07 14:30:30 -07:00
danielgrippi
f3a51615af
min-height instead of height to fix background issues [ci skip]
2012-05-07 13:29:56 -07:00
danielgrippi
730886c082
MS DG; fix some styling for empty profile state
2012-05-07 12:15:43 -07:00
danielgrippi
01d5c0473a
DG MS; don't redirect to legacy getting started if you're a beta user
2012-05-07 12:05:36 -07:00
Maxwell Salzberg
13b60cc5c2
more readme tweaks [ci skip]
2012-05-07 08:28:55 -07:00
