danielgrippi
311afa7dc9
i guess my captions commit got lost somewhere [ci skip]
2012-04-24 13:56:37 -07:00
Dennis Collinson
6ac1c5bc21
images aren't darkened in wallpaper if they don't have text
2012-04-24 13:27:27 -07:00
Florian Staudacher
0dcb0f6446
attach handlers to a instead of img (rel #2950 )
2012-04-24 22:08:10 +02:00
danielgrippi
931dd2621b
fixed captions and stuff [ci skip]
2012-04-24 12:45:00 -07:00
danielgrippi
bff9d2d370
small css padding tweaks [ci skip]
2012-04-24 12:45:00 -07:00
danielgrippi
fe72c59ff7
make stars closer to the edges of posts [ci skip]
2012-04-24 01:04:49 -07:00
danielgrippi
91ebff75dd
added tests and stuff for own profile checking... for some reason something isn't getting triggered properly in the presenter call, though :(
2012-04-24 01:04:49 -07:00
Maxwell Salzberg
c667dac248
tweak single post css
...
I kinda just fished thru @deadsuperhero's posts and try to make them
look better
2012-04-23 23:57:02 -07:00
danielgrippi
84bd1fb1fc
return the person json response for profiles to get a correctly formatted name and expected avatar response; fix a jasmine spec around redirection
2012-04-23 23:31:39 -07:00
danielgrippi
dbe3b48aee
now you can click on an entire post to favorite / unfav it. yay. [ci skip]
2012-04-23 23:04:53 -07:00
danielgrippi
4be6f196cd
fix roboto; break long urls and stuff in sticky notes [ci skip]
2012-04-23 22:31:41 -07:00
Maxwell Salzberg
bf110f0818
make the default font size 2em [ci skip]
2012-04-23 19:18:39 -07:00
danielgrippi
3704170416
I <3 ROBOTO. [ci skip]
2012-04-23 19:17:31 -07:00
Dennis Collinson
6daafbd5a8
better stylings for markdown
2012-04-23 18:57:58 -07:00
danielgrippi
4bd1caa7fd
noteworthy typeface for big text [ci skip]
2012-04-23 18:51:59 -07:00
Dennis Collinson
43ed6dde46
fix width for markdown images [ci skip]
2012-04-23 18:19:34 -07:00
Dennis Collinson
40c04234bd
navigate to experimental profile on successful post
2012-04-23 18:08:02 -07:00
Dennis Collinson
044d03c12c
MS DC fix you tube videos on screen.
2012-04-23 18:08:02 -07:00
danielgrippi
8390756ddd
pop up stats on hover instead of always showing them [ci skip]
2012-04-23 17:57:04 -07:00
danielgrippi
51a6a3c8a3
added stars [ci skip]
2012-04-23 17:43:32 -07:00
Dennis Collinson
d64eb529d2
MS DC; text now overlays for wallpaper; ALSO. really sorry @danielgrippis stuff does not work in firefox. or safari.
...
or konqueror. we will talk to him about it later
2012-04-23 17:30:23 -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
88a17474f7
MS DC kill dead code in small Frame
2012-04-23 16:52:09 -07:00
Dennis Collinson
cfa518674f
MS DC MOAR profile tweaks, show cubbies posts
2012-04-23 16:45:16 -07:00
Dennis Collinson
0e8fd604e9
DC MS reworking newprofile grid WHOA
2012-04-23 16:44:39 -07:00
danielgrippi
affba80524
tweak profile top layout [ci skip]
2012-04-23 16:43:32 -07:00
Dennis Collinson
e8cfe01c8a
reLayouts when something is favorited, whoa
2012-04-23 12:35:13 -07:00
Maxwell Salzberg
85f2f13d79
more color [ci skip]
2012-04-23 12:23:10 -07:00
Maxwell Salzberg
bcdd03b4e9
markdownify profile in new profile view
2012-04-23 11:42:49 -07:00
Florian Staudacher
9562adaa10
put date formatting in a mixin
2012-04-23 14:34:20 +02:00
danielgrippi
f6a9fad9ad
make line height a bit better on yellow notes
2012-04-22 18:36:46 -07:00
danielgrippi
3eda2ca3a6
fix some pixels [ci skip]
2012-04-22 17:36:41 -07:00
danielgrippi
98e614bbe8
specifiy masonry width [ci skip]
2012-04-22 17:05:30 -07:00
Dennis Collinson
afc26c684b
DC MS infinite scroll with isotope on new profile page. boom!
2012-04-22 16:46:39 -07:00
danielgrippi
b6fc97a2a4
added styling & color to text posts [ci skip]
2012-04-22 16:21:22 -07:00
danielgrippi
85ab08035e
added stats on posts [ci skip]
2012-04-22 14:21:26 -07:00
danielgrippi
75d25e9475
users can now favorite posts
2012-04-22 12:06:15 -07:00
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
