Benjamin Neff
ea90c6caf0
remove "message" from invite-form (not used in email)
2012-05-13 02:51:54 +02:00
Dennis Collinson
f6e3c1b88b
seperate interactions from posts
...
Lazily load post interactions on show page
hella refactorz
2012-05-12 17:41:58 -07:00
Benjamin Neff
0b5f611f19
fix aspect dropdown on contacts page [ci skip]
2012-05-13 01:44:28 +02:00
Benjamin Neff
dd949fa715
fix oembed when empty [ci skip]
2012-05-13 00:29:51 +02:00
Benjamin Neff
2ff98a1001
fix paragraph margin for comments and posts
2012-05-12 23:38:28 +02:00
movilla
7538f89a95
Translation registrations/new
2012-05-12 22:18:10 +02:00
danielgrippi
871d3cc672
i am dumb. include custom mobile in before_deploy [ci skip]
2012-05-11 17:12:30 -07:00
danielgrippi
81661c883f
custom landing page logic for mobile. yay
2012-05-11 17:05:09 -07:00
danielgrippi
132bdd3bc5
change create and edit buttons on new profile; remove old press assets
2012-05-11 15:12:22 -07:00
danielgrippi
e1e4ce8e4f
Merge branch 'master' of github.com:diaspora/diaspora
2012-05-11 13:25:57 -07:00
Florian Staudacher
2d810a0c43
missing quotes... [ci skip]
2012-05-11 21:20:56 +02:00
Florian Staudacher
6cf163766a
install script now checks for proper rvm/ruby and js runtime [ci skip]
2012-05-11 21:13:15 +02:00
danielgrippi
2e320eee8b
remove jd.com specific landing page folder from /public [ci skip]
2012-05-11 10:13:07 -07:00
Jonne Haß
7a6d325f64
looks like there are sometimes objects passed into post presenter that respond to root while root is nil
2012-05-11 14:23:05 +02:00
Steven Hancock
b16f309aca
Upgrade Rails Admin to latest gem
...
This gives us a clean fix for the Kaminari vs. Will Paginate
issues and fixes a few other little bugs in Rails Admin.
fixes #3210
2012-05-11 03:32:05 -07:00
danielgrippi
f820e37838
use .erb for custom landing page instead of .haml [ci skip]
2012-05-11 02:27:33 -07:00
danielgrippi
7423dd095f
landing fixes for moz [ci skip]
2012-05-11 02:19:46 -07:00
danielgrippi
4b8cd8eb23
whoopsies on landing [ci skip]
2012-05-11 01:30:15 -07:00
danielgrippi
608a15faf4
the landing page.
2012-05-11 01:06:51 -07:00
danielgrippi
a3ca176d74
new getting started page [ci skip]
2012-05-10 20:43:00 -07:00
Dennis Collinson
9b9a64ffd0
fix reshares in interaction presenternavigate replace states on next or previous so back and forward work
...
default user image
2012-05-10 15:28:27 -07:00
Dennis Collinson
3326bc5bb4
present reshares
2012-05-10 15:16:05 -07:00
Dennis Collinson
51b1ade3bc
DC DG; added LastThreeComments decorator so we don't have to load those comments when not needed (i.e. new profile pages)
2012-05-10 13:53:00 -07:00
Florian Staudacher
9f586e915f
well, then let's try the other thing that is suggested on that page to fix cukes
2012-05-10 22:09:31 +02:00
Dennis Collinson
efa79a4ad7
Refactor Post Presenter
...
and comment presenter
2012-05-10 12:24:21 -07:00
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
