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

5778 commits

Author SHA1 Message Date
danielgrippi
494ba1f9b8 images that are single pane fill up the whole frame [ci skip] 2012-04-21 23:20:19 -07:00
danielgrippi
d38582c5de youtube in canvas [ci skip] 2012-04-21 23:07:44 -07:00
danielgrippi
265e14fb13 remove some old small frame declarations [ci skip] 2012-04-21 22:25:37 -07:00
danielgrippi
ab7ac667d8 only focus on photos for now with ratios. one thing at a time, yo. 
i've temporarily removed all the arbitrary text switching for now (which is still in version control // which we will get to later)
also moved photo dimensions into a dimensions hash in photo.rb.
 2012-04-21 20:42:50 -07:00
Dennis Collinson
0279874e32 markdownify small frames, css for new profile. 2012-04-21 16:05:24 -07:00
Dennis Collinson
ca33070b9e loader is background image of span 
fix tests
 2012-04-21 15:21:52 -07:00
danielgrippi
e2adb8d26f squares; how do they work 2012-04-21 13:12:57 -07:00
danielgrippi
b4ca14ade4 DG MS; clicking a post in the profile goes to the show page. 2012-04-21 13:12:57 -07:00
danielgrippi
aa4c554177 DG MS; added photos and more styling to the canvas view. 2012-04-21 13:12:57 -07:00
Dennis Collinson
3130bbad97 render template currently needs to be overridden WHOA junglist massiv 2012-04-21 13:12:57 -07:00
Dennis Collinson
f46dd08cb5 canvas view is infinite stream 2012-04-21 13:12:57 -07:00
Dennis Collinson
062de4c269 MDC DC New Profile shows users info 
Profile show json
Profile backbone model
 2012-04-21 13:12:56 -07:00
danielgrippi
f62b9f9698 wip. 2012-04-21 13:12:56 -07:00
danielgrippi
6d9dd1f4d3 skeleton in place. 2012-04-21 13:12:56 -07:00
Maxwell Salzberg
63a0a37171 width and height should now federate 2012-04-20 12:53:02 -07:00
Maxwell Salzberg
1b2440f68a we now store image height and width locally; still need to federate the values 2012-04-20 12:22:12 -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
397b89c21a small improvements to open graph stuff [ci skip] 2012-04-19 21:03:06 -07:00
Maxwell Salzberg
cdef049529 include a default image in the og:image [ci skip] 2012-04-19 20:33:11 -07:00
Maxwell Salzberg
a008aaeba8 make the embed tags have a bit more length 2012-04-19 20:20:40 -07:00
Maxwell Salzberg
8b50f80875 be pedantic in posts show as maybe certain crawlers are being greedy as to what formats they can accept 2012-04-19 20:07:14 -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
Dennis Collinson
7253f190b5 rename css selector to MAGIC 2012-04-19 14:18:55 -07:00
Dennis Collinson
f7d320b622 MS DG; checkboxes are togglable, with tested css magick 2012-04-19 14:05:55 -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
Florian Staudacher
fe7de0544d forgot to rename that ... (fixes #3169) 2012-04-19 20:24:11 +02:00
Dennis Collinson
8386179f16 max, you're a princess, WIP 2012-04-19 11:15:59 -07:00
Florian Staudacher
9f1713b8f9 bind to new eventname [ci skip] 2012-04-19 14:06:09 +02:00
danielgrippi
e379a6df0f Merge branch 'master' into stream-for-photos 
Conflicts:
	app/assets/javascripts/app/views/stream_view.js
 2012-04-18 18:30:54 -07:00
Maxwell Salzberg
ab48ca260b kinda ugly hack for ports in url with iframes 2012-04-18 16:12:57 -07:00
Maxwell Salzberg
c9e3852de8 oembed mostly works 2012-04-18 16:12:56 -07:00
Maxwell Salzberg
31172a9959 basic oembed provider set up... too tried to finish this now 2012-04-18 16:12:56 -07:00
danielgrippi
a307b60dd2 DC DG extract infininte scroll to a mixin 2012-04-18 12:34:43 -07:00
Florian Staudacher
d8c42fde67 remove app.models.Photos 2012-04-18 20:21:16 +02:00
Florian Staudacher
8eb70c8a80 use app.models.Stream instead of app.models.Photos, 
change naming a bit to be more general since its posts+photos now
(re #3158)
 2012-04-18 20:20:56 +02:00
Florian Staudacher
4385027443 small js fixes 
closes #3106 - hardening url handling,
fixes #2725 - backport from upstream
 2012-04-18 19:59:34 +02: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
Maxwell Salzberg
b10aedb615 update the iframe route, fix a small styleing thing in newspaper style for iframe view 2012-04-17 22:43:47 -07:00
Maxwell Salzberg
90a2f05515 include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770 2012-04-17 22:28:01 -07:00
danielgrippi
3479cb7bdd refactored stream and Stream View 
streamView no longer abuses render with fetching
moved post collapsing into contentView
subtle nicification.
 2012-04-17 21:06:34 -07:00
danielgrippi
37cd6f616e refactor stream fetching logic 2012-04-17 19:18:12 -07:00
Dennis Collinson
16223d003f change new publisher to public by default to make testing easier 2012-04-17 16:43:42 -07:00
Maxwell Salzberg
1a7ec495c9 Merge pull request #3136 from movilla/Auto_fix 
Issue #3134:Problem with translation in authorizations/new.html.haml
 2012-04-17 13:52:29 -07:00
Jonne Haß
b99e77d8ce Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-04-16 23:59:03 +02:00
Florian Staudacher
fe130caf10 moved non-ascii url markdown tests to text_formatter_spec, added test case + fix 2012-04-16 23:41:05 +02:00
Maxwell Salzberg
3586413b18 sorry :( Revert "adding custom landing page for heroku" [ci skip] 
This reverts commit f7d1f0d9b9.
 2012-04-15 17:11:13 -07:00
Maxwell Salzberg
17b451e4ad tags for logging [ci skip] 2012-04-15 17:04:53 -07:00
Maxwell Salzberg
b0e4c477bf log more in authorizations controller :( 2012-04-15 17:03:09 -07:00
Maxwell Salzberg
f7d1f0d9b9 adding custom landing page for heroku 2012-04-15 15:34:30 -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
Florian Staudacher
d328cdaa96 "twipsy" is now "tooltip", "position" must be "placement" and "select" is not a valid trigger 
- should fix a few cukes...
 2012-04-15 02:02:12 +02:00
Maxwell Salzberg
ecc1a84b42 rails_admin; i do what i want 2012-04-13 18:08:52 -07:00
Dennis Collinson
a0ea8c8542 Update aspects dropdown to say number of selected aspects 2012-04-13 17:49:49 -07: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
Dennis Collinson
9e50d0efb6 Newspaper theme selected by default, template picker object 2012-04-12 15:21:07 -07:00
Dennis Collinson
c1f2bbac88 Wallpaper frame selected when post has one photo 2012-04-12 11:56:27 -07:00
Jonne Haß
83103c4761 deterministic stream order take 2, this time with spec 2012-04-12 16:33:02 +02:00
Dennis Collinson
d767410e6d mentions are clickable in framer 2012-04-11 18:34:12 -07:00
Dennis Collinson
20da08408f can mention in new composer 2012-04-11 17:07:53 -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
Jonne Haß
3bfaa3fa24 made stream order deterministic 2012-04-11 16:42:28 +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
Movilla
7193bf7777 Issue #3134:Problem with translation in authorizations/new.html.haml 2012-04-11 00:00:41 +02:00
Dennis Collinson
f610cdce17 tweak composer [ci skip] 2012-04-10 12:22:36 -07:00
Dennis Collinson
b543f8a3ca fix display of service icons [ci-skip] 2012-04-10 12:12:40 -07:00
danielgrippi
a1d4ca9bec Refactor composer and framer to user same layout 
composer touchup; added controls to the bottom; centered input area; removed forms.Base view

Fix tests
 2012-04-10 11:38:35 -07:00
Maxwell Salzberg
f6b6a67729 this file got renamed 2012-04-10 10:30:52 -07:00
Maxwell Salzberg
11d9b50f3a a solution for a problem with pulling back all visible public ids when querying 
after much sleuthing, this is an extremely hacky way to limit the
amount of public post _ids we are pulling back with every query.
previously, for unknown reason, we were pulling back all of them from
people you are connected to, and doing giant in queries which were
causing bad things to happen.  As far as I can tell, we are in fact
keeping track of the page( i.e. max time and offset) so there was no
need to pull all of them back.  This whole file is a huge clusterf*ck,
so it really should just get totally refactored, as the stuff that is
happening is not really as scary as it looks :(
 2012-04-10 00:40:34 -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
Jonne Haß
2f7bed1f44 Merge pull request #3128 from m4tze/master 
email-invitation translation error in subject and body
 2012-04-09 05:26:34 -07:00
Jonne Haß
2205353171 Merge pull request #3127 from movilla/amp_arito3 
Add translation /authorizations fix image
 2012-04-09 05:19:48 -07:00
matze
76073d45ed ~FIX: changed the translate pattern inside notifier.rb: correct mail subject will be translated 
~Translate: changed the mail contents of the invitation mail: no weird html string below the invitecode url.

- M
 2012-04-09 00:25:08 +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
Florian Staudacher
9c7103be1d don't set publisher height on focus (already done in css), fixes #3109 2012-04-06 21:21:35 +02:00
Florian Staudacher
024f1fee74 disable jQuery effects for tests 
... might buy us a few seconds
 2012-04-05 16:12:45 +02:00
danielgrippi
59917e95ab update feature_flagger to have access to current user 2012-04-04 19:35:53 -07:00
Maxwell Salzberg
9c9562d0fd fix http urls with 3 slashes 2012-04-04 19:08:36 -07:00
danielgrippi
39d688044d DG DC; visual fixups 2012-04-04 18:59:19 -07:00
danielgrippi
6098890783 redirect to post show on create 2012-04-04 18:59:19 -07:00
danielgrippi
9b02633dff framer has better styling 2012-04-04 18:59:19 -07:00
Dennis Collinson
06110b8732 newspaper template WIP 2012-04-04 18:59:19 -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
danielgrippi
59f092c26a added bootstrap extensions to new-templates [ci skip] 2012-04-04 13:22:44 -07:00
Maxwell Salzberg
d755f03cd0 add two more images to the assets 2012-04-04 13:12:07 -07:00