Commit graph

291 commits

Author SHA1 Message Date
Tom Scott
51db25e333 Fix .close img looking off-center. 2013-01-13 23:47:15 -05:00
Tom Scott
e5d027e29e Merge pull request #3839 from asphxia/feature/3837-hovercard-causes-horizontal-scrollbar
Hovercard no longer causes horizontal scrollbar to appear. Fixes #3837.
2013-01-13 20:41:32 -08:00
Asphyxia
bcc11b3c41 Issue #3837: Hovercard causes horizontal scrollbar to appear 2013-01-14 00:04:36 -03:00
Asphyxia
df8f46b5af fix .popover overlapping header 2013-01-12 10:51:31 -03:00
Asphyxia
cd6bd0e28f fix after sign-up popups overlaping header 2013-01-12 07:41:16 -03:00
Diaspora Europe
c8ddba6b3e add images to notifications 2013-01-11 12:30:12 +01:00
Florian Staudacher
0092acd492 re-add hovercards
* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
2012-12-28 22:37:13 +01:00
movilla
ceace52762 Add progress percentage to upload images 2012-12-20 21:24:09 +01:00
movilla
763a893829 Add flash warning to conversation mobile, unification of flash warning with login and register mobile, and add support for flash warning to Opera browser 2012-12-08 14:59:01 +01:00
Jonne Haß
0677459ff9 Merge branch 'css_mobi_notif' of git://github.com/movilla/diaspora into develop 2012-12-08 13:47:13 +01:00
movilla
3fa0254876 add simple background for unread messages/conversations mobile 2012-11-13 19:58:25 +01:00
David McMullin
97664cb880 port tagFollowings to BackBone 2012-11-12 21:37:00 +00:00
Jonne Haß
a78cacb799 Merge pull request #3687 from movilla/add_icon_mobile_my_activity
Add My Activity icon mobile. Close #3680
2012-11-06 09:02:46 -08:00
movilla
e943a1cab6 Fix overflow button in mobile reset password 2012-10-31 23:31:24 +01:00
movilla
880b16f530 Add My Activity icon mobile 2012-10-29 12:14:19 +01:00
movilla
c9b58c9ff6 Add My Activity icon mobile 2012-10-26 22:47:43 +02:00
Fabián Rodríguez
40f5314184 adds password_confirmation field to registration page 2012-10-11 19:45:52 -02:00
movilla
509aa3116d Edit Profile issue with misaligned elements - Fix 3599 2012-10-08 15:25:17 +02:00
movilla
aa8c89a0e4 css error in post-viewer after update bootstrap 2012-09-29 15:19:39 +02:00
Jonne Haß
3e44808cb2 Merge pull request #3587 from movilla/image_profile_post
images disappeared user profiles in the publication (/post/) for not having class in css
2012-09-17 15:43:00 -07:00
movilla
bacb99cd18 images disappeared user profiles in the publication (/ post) for not having class in css 2012-09-17 23:41:46 +02:00
Jonne Haß
42f97db42e Merge branch 'select_aspects_dropdown_list' of git://github.com/movilla/diaspora into develop 2012-09-17 21:36:36 +02:00
movilla
ae0ac1c72d css change when you choose aspects before posting -dropdown list- 2012-09-16 17:37:27 +02:00
Jonne Haß
f1631084d3 Merge pull request #3579 from movilla/css_modification_counter_tw_fb_tmblr
css modification on the number of characters twiter, facebook and tumblr...
2012-09-14 08:28:58 -07:00
movilla
426fe1ab7d css modification on the number of characters twiter, facebook and tumblr -.counter- 2012-09-14 16:45:03 +02:00
Jonne Haß
2de0213d6f Revert "Removed a couple missed "new_styles" assets."
This reverts commit e323d6134e.
2012-09-12 12:55:57 +02:00
Jonne Haß
2b729059c9 was too long awake last commit, here are the files back we still need 2012-09-12 12:55:57 +02:00
Hans Fase
e323d6134e Removed a couple missed "new_styles" assets. 2012-09-12 04:05:33 -04:00
Jonne Haß
7ec2f8f419 finish beta striping
A lot of cleanup is still needed, refactoring the CSS to be consistent, removing all sorts of unused stuff etc
2012-09-12 07:51:19 +02:00
Jonne Haß
ffde639f4d Merge branch 'betastrip' of git://github.com/DeadSuperHero/diaspora 2012-09-12 04:55:10 +02:00
Sean Tilley
49ea8c8563 Strip Beta Features 2012-09-11 21:52:53 -05:00
Florian Staudacher
04a17fd508 Merge pull request #3561 from movilla/NSFW_mobile_will_come_back
NSFW mobile come back
2012-09-10 13:08:51 -07:00
movilla
a4a483af90 NSFW mobile come back 2012-09-10 20:48:34 +02:00
Sean Tilley
3deff9327a Merge pull request #3557 from movilla/web_mobile_login_second
New web mobile login (Jonne suggestion) [ci skip]
2012-09-08 12:02:15 -07:00
movilla
a564cbff9d New_login_mobile_web_ 2012-09-08 15:30:59 +02:00
Jeremy Huffman
c8f8f6741a let profile tag entry grow to size of input box
use auto so line-breaks work better
2012-09-07 23:24:41 -04:00
movilla
b0ecc57631 Fix uncomfortable overflow mobile post 2012-09-05 16:51:27 +02:00
Florian Staudacher
45223fd634 Merge pull request #3520 from movilla/new_mobile_resgistrations_
New mobile page registrations, add an error message to registrations page, friendlier design, add placeholders and ().upcase
2012-08-31 01:17:20 -07:00
movilla
6c6be3e22a New mobile_web registrations 2012-08-29 23:09:52 +02:00
Daniel Grippi
b8f7d025d5 update landing page 2012-08-24 13:45:05 -07:00
movilla
e41ef3caa5 Small changes in mobile_style 2012-08-20 22:40:52 +02:00
movilla
9913f40a38 Added private conversation for mobile 2012-08-20 16:33:05 +02:00
movilla
9931f39ce0 add mobile conversation 2012-08-12 05:01:42 +02:00
Maxwell Salzberg
f065ba624b Merge pull request #3492 from movilla/footer_mobile
add padding-top footer mobile [ci skip]
2012-08-09 11:43:22 -07:00
Movilla
30d5816ae5 add padding-top footer mobile 2012-08-09 17:12:49 +02:00
Florian Staudacher
c6ff849eb9 stream 'reshare' link undeliberately got the same font-size as the container [ci skip] 2012-08-07 19:24:22 +02:00
Maxwell Salzberg
a841d3a839 derp, not everyone wants a cdn from google. if anyone who has this problem wants to fix it, you need to set cross origin headers for your fonts
if they are hosted from another domain for FF to recognize them. You cant set said header on cloudfront. Revert "fix roboto in firefox""

This reverts commit e87d9af52c.
2012-08-03 10:46:41 -07:00
Maxwell Salzberg
e87d9af52c fix roboto in firefox" 2012-08-02 23:01:05 -07:00
Florian Staudacher
b9c4e8a02f let the 'toggle mobile' link show in the footer, refactored layout a bit 2012-07-22 15:25:51 +02:00
Florian Staudacher
629277502f Merge pull request #3450 from despora/mobile_messages
add messages/conversations to mobile
2012-07-16 15:10:00 -07:00
Florian Staudacher
6efcac48b5 fix flash messages 2012-07-15 19:33:32 +02:00
Lennart Prelle
00032a1649 add messages to mobile 2012-07-14 14:23:03 +02:00
Florian Staudacher
e19d73792d oembed video info 2012-06-25 15:25:09 +02:00
Florian Staudacher
9588169019 fix oembed iframe/thumb width for reshares [ci skip] 2012-06-25 13:09:56 +02:00
Florian Staudacher
1fb016597d remove leftover edges from spinner, remove red bg color (fixes #3338) [ci skip] 2012-06-18 23:40:55 +02:00
Florian Staudacher
8ca39f5936 show a "post is not public" message when visitor is not logged in
and tries to access a show page of a non-public post
2012-06-07 22:16:37 +02:00
Benjamin Neff
769836c221 remove border from reshare link 2012-06-03 18:42:55 +02:00
Dennis Collinson
374ec73fa4 make it clearer which frame is active, and fixes for scrolling flow. 2012-05-30 18:06:12 -07:00
Maxwell Salzberg
91db7859d8 Merge pull request #3340 from DeadSuperHero/YouTubeFix
Fix for YouTube Embeds in Show Pages [ci skip]
2012-05-30 17:52:50 -07:00
Sean Tilley
dfa925c375 remove max-height for iframe in show pages, this gets rid of the Chromium bug where YouTube videos appear in strange, elongated dimensions 2012-05-30 19:11:27 -05:00
Maxwell Salzberg
d926529ad7 wip dennis 2012-05-30 16:58:21 -07:00
Sean Tilley
0fff23f233 Merge pull request #3319 from clavisound/patch-1
I hope it solves bug 3292 (inverted desktop colors) [ci skip]
2012-05-27 21:58:45 -07:00
clavisound
f8d20751df I hope it solves bug 3292 https://github.com/diaspora/diaspora/issues/3292 2012-05-25 21:01:46 +03:00
Florian Staudacher
54c21f95f0 fix author box in FF (fixes #3278) [ci skip] 2012-05-25 14:26:09 +02:00
Maxwell Salzberg
f2a67bbcc0 more legacy styling for the stream [ci skip] 2012-05-24 20:27:44 -07:00
Dan Hansen
1327e5a492 bugmash #1
Adding long text before @mention breaks mentioned name highlighting
2012-05-24 19:34:39 -07:00
Maxwell Salzberg
d270910500 set the submit button to be disabled on the framer, and write a test 2012-05-24 11:36:43 -07:00
danielgrippi
fd6a858f83 don't do big styling on frames with the has-media class [ci skip] 2012-05-24 11:04:12 -07:00
danielgrippi
a5f023354a fixed the empty state styling on smallframe [ci skip] 2012-05-24 11:00:07 -07:00
danielgrippi
34d98a6d3c fixed some styling during the framing process [ci skip] 2012-05-23 18:47:01 -07:00
danielgrippi
5b3fcd07f3 added texture directory to assets/images [ci skip] 2012-05-23 17:28:02 -07:00
danielgrippi
5d2ea71766 added EditbaleSmallFrame class; frame on framer second step is partially editable 2012-05-23 17:07:41 -07:00
Maxwell Salzberg
fbb0961762 make logo on new stream a link back to stream [ci skip] 2012-05-23 16:07:42 -07:00
danielgrippi
2a37491be0 changed service icons; icons for template picker [ci skip] 2012-05-23 15:09:57 -07:00
Maxwell Salzberg
c21bc14c78 center big text on frames [ci skip] 2012-05-23 15:03:38 -07:00
Maxwell Salzberg
f3af73efc2 make some text on some legacy posts readable in the new stream [ci skip] 2012-05-23 14:59:11 -07:00
danielgrippi
92cbcae9c3 DG MS; moved framer controls into a subview & off to the side 2012-05-23 12:16:35 -07:00
danielgrippi
c6b8d75313 DG MS; cool header with background in new stream 2012-05-22 19:00:22 -07:00
danielgrippi
0c7492b94d DG MS; add hatched texture to new stream [ci skip] 2012-05-22 15:58:34 -07:00
danielgrippi
20360b5cc5 DG MS; added interactions & permalink in the new stream [ci skip] 2012-05-22 15:48:23 -07:00
danielgrippi
2e52def47a DG MS; background colors for great justice (on the stream) 2012-05-22 15:47:09 -07:00
danielgrippi
abc4843273 DG MS; got scroll working [ci skip] 2012-05-22 14:35:05 -07:00
danielgrippi
83fec811cc DG MS; author attribution in the stream; cleaned up some *new* stream styling 2012-05-22 13:50:19 -07:00
Dennis Collinson
36ef010ed9 DG DC MS; stream has one interactions div 2012-05-22 12:38:48 -07:00
danielgrippi
64a73fb665 new post types. remove old ones. yeah. 2012-05-21 18:45:01 -07:00
danielgrippi
777c037e16 kill rich-media type with fire 2012-05-21 12:33:28 -07:00
danielgrippi
72f718c8c3 new login page. kept the old one for safe keeping. 2012-05-19 11:10:17 -07:00
danielgrippi
f4c06c8f88 add rounded buttons to the composer flow; slay multi-photo option 2012-05-18 19:46:51 -07:00
danielgrippi
62ba75ad1b DG DC; Move stuff to second page of framer 2012-05-17 19:02:58 -07:00
Dennis Collinson
00f1adc8b2 Going back to the composer from the framer is happy via button 2012-05-17 15:32:35 -07:00
danielgrippi
ed6785d7cb don't use an iframe for the composer anymore. yayyyyy 2012-05-16 18:55:25 -07:00
Dennis Collinson
6282450418 killing rich media styling, WE'LL DO IT LIVE 2012-05-14 19:13:33 -07:00
Dennis Collinson
a90968ea2d basic experimental stream 2012-05-14 17:57:02 -07:00
Maxwell Salzberg
5968583857 Merge pull request #3253 from SuperTux88/fix-paragraph-margin
fix paragraph margin for comments and posts [ci skip]
2012-05-14 15:39:25 -07:00
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
danielgrippi
7a11e9fd37 full bleed the mobile images [ci skip] 2012-05-14 11:44:41 -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
Benjamin Neff
0b5f611f19 fix aspect dropdown on contacts page [ci skip] 2012-05-13 01:44:28 +02:00