Diaspora Europe
019b68281e
handle text-overflow for long usernames #2557
2012-02-23 12:21:01 +01:00
Maxwell Salzberg
7aba1ce1f7
Merge branch 'Raven24-user-photos'
...
Conflicts:
public/javascripts/app/router.js
public/stylesheets/sass/application.sass
2012-02-18 17:12:14 -08:00
danielgrippi
be363b98e5
DG MS; move logic out of layout into LayoutsHelper.
2012-02-18 16:28:03 -08:00
Dennis Collinson
32d58e8a9b
toggle all nsfw posts
2012-02-18 16:26:17 -08:00
danielgrippi
87aa1fde34
change language around explore/participate.
2012-02-18 16:26:15 -08:00
danielgrippi
dba50ae273
Bring the likes back. Ditch the pins.
...
Revert "swap pin for heart [ci skip]"
This reverts commit 488e064e119377dd30f4d06ccb9ba9
2012-02-18 16:26:15 -08:00
danielgrippi
431a04b0a8
made nsfw shield nicer and more condensed [ci skip]
2012-02-18 16:26:14 -08:00
Maxwell Salzberg
6f3fb6ee67
fix css of new comment box [ci skip]
2012-02-18 16:26:14 -08:00
danielgrippi
011f70a9f4
fix a bunch of small css related media box issues [ci skip]
2012-02-18 16:26:13 -08:00
danielgrippi
6573559faf
fix weird search bar shadow issue in chrome [ci skip]
2012-02-18 16:26:11 -08:00
danielgrippi
24e37cf32b
fix syntax in comment.rb
2012-02-18 16:26:11 -08:00
danielgrippi
29ea9c05e3
fix reshare tempalte; reorder header
2012-02-18 16:26:10 -08:00
danielgrippi
173894d926
stubbornella media and img dom structure FTW! major css deletion <3
2012-02-18 16:26:10 -08:00
danielgrippi
a16a8fc784
Participate / Explore have been upgraded to top-level status.
2012-02-18 16:26:10 -08:00
Florian Staudacher
2d29f93e42
fix shifted image button in firefox
2012-02-18 16:26:10 -08:00
Maxwell Salzberg
bc9e4ca196
Merge pull request #2853 from Raven24/publisher-images
...
fix shifted image button in firefox [ci skip]
2012-02-16 17:25:06 -08:00
danielgrippi
62c0ad13b7
DG MS; move logic out of layout into LayoutsHelper.
2012-02-15 18:38:36 -08:00
Dennis Collinson
e16a20e18c
toggle all nsfw posts
2012-02-14 14:15:24 -08:00
danielgrippi
b27961b38a
change language around explore/participate.
2012-02-13 19:13:43 -08:00
danielgrippi
ab76b0cd8e
Bring the likes back. Ditch the pins.
...
Revert "swap pin for heart [ci skip]"
This reverts commit 488e064e119377dd30f4d06ccb9ba9
2012-02-13 19:13:43 -08:00
danielgrippi
f1c119452a
made nsfw shield nicer and more condensed [ci skip]
2012-02-13 14:12:14 -08:00
Maxwell Salzberg
f3d790a4c2
fix css of new comment box [ci skip]
2012-02-10 16:48:55 -08:00
danielgrippi
ed3d5c429a
fix a bunch of small css related media box issues [ci skip]
2012-02-10 15:18:27 -08:00
danielgrippi
0056bc354e
fix weird search bar shadow issue in chrome [ci skip]
2012-02-09 18:35:19 -08:00
danielgrippi
2b15bc7938
fix syntax in comment.rb
2012-02-09 18:29:52 -08:00
danielgrippi
f7e09df49b
fix reshare tempalte; reorder header
2012-02-09 15:50:32 -08:00
danielgrippi
e6e49bbf1f
stubbornella media and img dom structure FTW! major css deletion <3
2012-02-09 14:29:01 -08:00
danielgrippi
398ca3d97b
Participate / Explore have been upgraded to top-level status.
2012-02-09 14:29:01 -08:00
Florian Staudacher
0208aa12f0
fix shifted image button in firefox
2012-02-09 15:24:05 +01:00
danielgrippi
9377dd30f4
reference pin icon in mobile view [ci skip]
2012-02-01 16:41:27 -08:00
Maxwell Salzberg
f826340336
push stream listings to the side a bit
2012-02-01 13:56:52 -08:00
danielgrippi
1d19dba9b4
add missing bootstrap files.
2012-01-29 15:19:46 -08:00
danielgrippi
bcbabc5fd2
Switch boilerplate for bootstrap 2 on mobile. [ci skip]
2012-01-29 11:51:47 -08:00
danielgrippi
5a78796ec0
Merge branch 'input-placeholders' of https://github.com/Raven24/diaspora into Raven24-input-placeholders
2012-01-26 19:52:27 -08:00
danielgrippi
a3d596a853
DG MS; only fetch contacts when focused in on Publisher.input(); limit autocomplete; added uma back; fixed jasmine tests.
2012-01-26 18:51:02 -08:00
danielgrippi
b021a26674
make mentions in selector more ledgable [ci skip]
2012-01-24 10:09:21 -08:00
danielgrippi
94ad9264f1
DG DH; wip
2012-01-23 19:31:00 -08:00
Dan Hansen
168d6cbdbe
jquery.mentionsInput wip, almost done
2012-01-23 19:31:00 -08:00
Daniel Grippi
2c50de0726
Merge pull request #2714 from stwf/im-sorry-bye-vanna
...
Remove Vanna Controller from app and fix up notifications controller, views, scripts, specs
2012-01-22 22:15:14 -08:00
Florian Staudacher
729f815736
checkbox labels should now be where they're supposed to (they were color:#CCC before, I left them #222 for now)
...
also labels are font-weight:normal and a little smaller since they seemed very dominant compared to the input fields (if not desireable, just remove font-size:.96em)
are there any more inputs I don't (yet) know about...?
2012-01-22 15:18:11 +01:00
Florian Staudacher
363ca8c07e
Merge branch 'master' of git://github.com/diaspora/diaspora into input-placeholders
2012-01-22 14:42:45 +01:00
Jonne Haß
54cb3ea3cb
more than 100% height <3, fix #2710 [ci skip]
2012-01-22 14:01:21 +01:00
Maxwell Salzberg
50e8e90066
add basic nsfw for mobile. fixes #2709
2012-01-22 01:56:16 -08:00
danielgrippi
cc1ac843cc
re-added widget; fixed tests; use _.throttle instead of depricated custom debounce
2012-01-21 20:23:00 -08:00
danielgrippi
c3b9bb9a9a
expanding likes works again
2012-01-21 18:55:07 -08:00
danielgrippi
8b4f0473a7
mobile header gradient reflects the desktop gradient; added background texture to mobile
2012-01-21 15:19:06 -08:00
Steven Fuchs
9836860ca3
Merge remote branch 'upstream/master' into im-sorry-bye-vanna
2012-01-20 12:23:45 -05:00
Jonne Haß
83e3e955b3
do not render markdown lists as comments [ci skip]
2012-01-19 14:44:06 +01:00
Maxwell Salzberg
aa449f3a2d
a couple of additions to the branch
2012-01-19 13:33:05 +01:00
Florian Staudacher
8f1ff89e10
search field should now look nice, too
2012-01-19 00:53:49 +01:00
