nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11959 commits 4 branches 0 tags 121 MiB
Commit graph

11959 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maxwell Salzberg
641ead632b Merge pull request #3254 from SuperTux88/fix-oembed-css 
fix oembed when empty [ci skip]
 2012-05-14 15:17:46 -07:00
Dennis Collinson
ca1a61825d make post load faster from profile to show 
using dirty preloads for now.
I like it dirty.
 2012-05-14 12:14:11 -07:00
danielgrippi
7a11e9fd37 full bleed the mobile images [ci skip] 2012-05-14 11:44:41 -07:00
Florian Staudacher
6661f91e1d make sure bundler is installed, be more specific in 'welcome' message [ci skip] 2012-05-14 13:01:49 +02:00
Jonne Haß
f4d996d644 do not break non heroku setups/do not confront them with a useless cryptic error message/do not use bundler 1.2 features but lock 1.1 in the Gemfile 2012-05-13 17:03:33 +02:00
danielgrippi
bcadedc258 specify ruby 1.9.3 in bundler for heroku. this requires a Successfully installed bundler-1.2.0.pre 
1 gem installed
Installing ri documentation for bundler-1.2.0.pre...
Building YARD (yri) index for bundler-1.2.0.pre...
Installing RDoc documentation for bundler-1.2.0.pre... [ci skip]
 2012-05-12 23:49:25 -07:00
danielgrippi
70b28105e7 fix a little padding and background image weirdness on ios [ci skip] 2012-05-12 22:56:18 -07:00
danielgrippi
f14907e64c more responsive stuffs [ci skip] 2012-05-12 22:29:08 -07:00
danielgrippi
31049fe1c4 get a little responsive in our css [ci skip] 2012-05-12 22:04:12 -07:00
Daniel Grippi
4fc44f137f Merge pull request #3255 from SuperTux88/fix-aspect-dropdown 
fix aspect dropdown on contacts page [ci skip]
 2012-05-12 20:21:38 -07:00
Dennis Collinson
3b897f29d8 kill unused (i hope) participations collection 2012-05-12 18:11:21 -07:00
Dennis Collinson
ec8625746e add counts to small frame presentercomment out entirity of post_view feature in the hopes it will stop making rake hang 2012-05-12 18:08:45 -07: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
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 was supposed to do.

With the initializer in an "unless Rails.env.production?" block
the entire initializer was being ignored in production mode and
loaded in all other environments, but Rails Admin was still
loading regardless of that. 😁

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