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

2956 commits

Author SHA1 Message Date
danielgrippi
193644b5c1 Revert "adding custom landing page for heroku" [ci skip] 
This reverts commit 6f951ac678.
 2012-04-26 17:57:54 -07:00
Maxwell Salzberg
6f951ac678 adding custom landing page for heroku 2012-04-26 16:45:46 -07:00
danielgrippi
6d866fa49d Revert "adding custom landing page for heroku" 
This reverts commit 2c9d84607a.
 2012-04-26 15:08:07 -07:00
danielgrippi
2c9d84607a adding custom landing page for heroku 2012-04-26 13:57:50 -07:00
movilla
cc329594c5 Add translation app/views/admins/user_search.html.haml - Admin Panel 2012-04-24 02:05:13 +02:00
Dennis Collinson
afc26c684b DC MS infinite scroll with isotope on new profile page. boom! 2012-04-22 16:46:39 -07:00
Dennis Collinson
ca33070b9e loader is background image of span 
fix tests
 2012-04-21 15:21:52 -07:00
danielgrippi
6d9dd1f4d3 skeleton in place. 2012-04-21 13:12:56 -07:00
Maxwell Salzberg
b4d50510f9 sorry aobut that [ci skip] 2012-04-20 10:40:22 -07:00
Movilla
7b203e3636 Better fix issue #3134 2012-04-20 16:07:31 +02:00
Maxwell Salzberg
5f839aa26f include modernizer in the mobile group so it works 2012-04-20 00:00:23 -07:00
Maxwell Salzberg
56312a3148 fix mobile modernizer with asset pipeline 2012-04-19 22:45:34 -07:00
Maxwell Salzberg
bfbae50e5a update a few things for the asset pipeline, and fix a couple of other mobile bugs 2012-04-19 21:52:44 -07:00
Maxwell Salzberg
a9b5df8dc5 Merge branch '3162-second-attempt' of https://github.com/wubwubwubcr3w/diaspora into wubwubwubcr3w-3162-second-attempt 2012-04-19 21:20:36 -07:00
Maxwell Salzberg
307ee15884 hella open graph tags 
added some basic open graph tags to the posts#show page.
 2012-04-19 17:40:13 -07:00
wubwubwubcr3w
ebd367c5a1 also readd mbp-respond.min.js 2012-04-19 22:00:15 +02:00
wubwubwubcr3w
70ba2651c3 second attempt on readding modernizr-custom.js 2012-04-19 20:37:42 +02:00
Maxwell Salzberg
c9e3852de8 oembed mostly works 2012-04-18 16:12:56 -07:00
danielgrippi
3621576717 add/remove hidden class for pagination instead of manipulating HTML contents on every page load. 2012-04-18 10:27:22 -07:00
Jordi Mallach
4d92653874 Fix typo in key name: seperated → separated. 2012-04-15 19:07:59 +02:00
Jordi Mallach
2bb9fbf58d Fix typo in key name: autorize → authorize. 2012-04-15 19:05:03 +02:00
Florian Staudacher
d9d7bbb74b using timecop for interactions + whitespaces removed 2012-04-15 03:10:18 +02:00
Maxwell Salzberg
c4b36a179e Merge pull request #3138 from stevenh512/bootstrap-sass 
bootstrap-sass (w00t)
 2012-04-13 17:44:08 -07:00
Steven Hancock
acf823ff1b bootstrap-sass fixes 
* Update interim-bootstrap to use the partials from bootstrap-sass,
since some of the names have been changed (and we're using the
Bootstrap 2 javascript now). This should make it easy to keep the
file up to date with the version of Bootstrap we're using.
* Use interim-bootstrap instead of bootstrap-complete in default.css to
avoid the little problem I ran into with Bootstrap + Blueprint grids
not getting along. :)
* Revert the CSS class change (from .span-24.last to .row) in
layouts/application since interim-bootstrap works around that problem.
* Get rid of .icon-black since it's not needed.
* Remove the 60px padding on the page body since it isn't needed and
causes problems with the single post view.
 2012-04-13 17:37:38 -07:00
Jonne Haß
cac2b1e10b lets just avoid no and yes as keys in YAML, too many issues. Thanks! [ci skip] 2012-04-11 22:06:33 +02:00
Steven Hancock
021cc99492 bootstrap-sass 
Upgrade our current Bootstrap 1 and 2 dependencies to use Bootstrap 2.0.2
from the bootstrap-sass gem.

I had to modify layouts/application to get the stream page to render properly,
looks like a slight conflict between Bootstrap and Blueprint grid systems, with
.span-24 instead of .row I was seeing the whole right bar dropped to the bottom
of the page below the left bar.

I also modified two other templates since Bootstrap 2.0.2 includes a "badge"
class that was making our navbar badges look funny. :)
 2012-04-11 06:16:01 -07:00
Maxwell Salzberg
f6b6a67729 this file got renamed 2012-04-10 10:30:52 -07:00
Maxwell Salzberg
a70b057bf5 update resources in devise emails :( 2012-04-09 22:56:30 -07:00
Maxwell Salzberg
ff740f41f6 fix bookmarklet on mobile 2012-04-09 10:48:43 -07:00
Maxwell Salzberg
903f4cb9ac Merge pull request #3124 from liamnic/master 
Fix Bookmarklet By Adding application.css[ci skip]
 2012-04-09 10:34:26 -07:00
Maxwell Salzberg
6642bd5554 Merge pull request #3121 from dmorley/patch-13 
Update app/views/shared/_photo_area.mobile.haml[ci skip]
 2012-04-09 10:32:26 -07:00
Maxwell Salzberg
0eb946497f Merge pull request #3101 from despora/fallback_for_donation 
added fallback for donation
 2012-04-09 10:24:20 -07:00
Jonne Haß
e9a22ae41a fix syntax error in authorizations/new.html.haml 2012-04-09 14:44:47 +02:00
movilla
6ded31a940 Add translation /authorizations fix image 2012-04-08 15:33:46 +02:00
Liam Nicholson
0cd2eb7b8d Fix Bookmarklet By Adding application.css. 2012-04-08 09:31:40 +02:00
David Morley
c9431a6512 Update app/views/shared/_photo_area.mobile.haml 2012-04-07 15:28:35 -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
Lennart Prelle
c2195a3c22 new forms 2012-04-04 11:44:57 +02:00
Lennart Prelle
01ed9fc9d9 fallback to diaspora donation if no paypal-id is present 2012-04-04 11:44:06 +02: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
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
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
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
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
movilla
af10497b6c Add translation via mobile 2012-03-29 17:26:03 +03:00
Diaspora Europe
9fdca1adf8 make URL clickable in RSS #2176 2012-03-29 13:43:04 +02: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
Steven Hancock
f96fc5834f Make the Mention button work with the asset pipeline 
* Fix the javascript_include_tag in the status_messages/new view
* Precompile pubhlsiher.js and jquery.textchange.min.js

This fixes a 500 error that was being thrown when the Mention button
was clicked, due to the above two javascripts not being precompiled
and a javascript include that needed to be updated to load
jquery.textchange.js from the correct path.
 2012-03-27 18:08:28 -07:00