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

291 commits

Author SHA1 Message Date
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
Benjamin Neff
dd949fa715 fix oembed when empty [ci skip] 2012-05-13 00:29:51 +02:00
Benjamin Neff
2ff98a1001 fix paragraph margin for comments and posts 2012-05-12 23:38:28 +02:00
danielgrippi
132bdd3bc5 change create and edit buttons on new profile; remove old press assets 2012-05-11 15:12:22 -07:00
danielgrippi
7423dd095f landing fixes for moz [ci skip] 2012-05-11 02:19:46 -07:00
danielgrippi
4b8cd8eb23 whoopsies on landing [ci skip] 2012-05-11 01:30:15 -07:00
danielgrippi
608a15faf4 the landing page. 2012-05-11 01:06:51 -07:00
Dennis Collinson
9b9a64ffd0 fix reshares in interaction presenternavigate replace states on next or previous so back and forward work 
default user image
 2012-05-10 15:28:27 -07:00
danielgrippi
62829aee85 remove obnoxious box-shadow transition on hover; transition on transform [ci skip] 2012-05-09 00:24:28 -07:00
danielgrippi
f053b71c87 add title to service icons. yay. [ci skip] 2012-05-08 18:28:31 -07:00
danielgrippi
0ec364e44c DG MS; popup on services, inlined in the composer 2012-05-08 18:09:33 -07:00
Maxwell Salzberg
b375182e0c let line breaks work but don't push everything down on the stream [ci skip] 2012-05-07 19:53:47 -07:00
Dennis Collinson
1c135b61fd Jamie Cai DC message in profile when user has no posts 2012-05-07 15:56:30 -07:00
danielgrippi
6e16a748e7 unfix css styling in one place; fix it in another [ci skip] 2012-05-07 15:13:27 -07:00
danielgrippi
f3a51615af min-height instead of height to fix background issues [ci skip] 2012-05-07 13:29:56 -07:00
danielgrippi
730886c082 MS DG; fix some styling for empty profile state 2012-05-07 12:15:43 -07:00
danielgrippi
56913ffb80 upload wallpaper for great success. 2012-05-06 12:35:11 -07:00
danielgrippi
91ffe00de2 apple-style drop shadows (blur the crap out of them); isotope doesn't overflow: hidden; anymore (no shadow cutoff) [ci skip] 2012-05-06 12:35:10 -07:00
danielgrippi
b5fbefad4b this changes profile background colors to be dark, and sets up the groundwork for uploading user-selected background images for their profiles. all the styling is in place; what remains is creating a new image uploader and (possibly) a new controller action. 
for information on what command to use to darken the background image that's uploaded, see line 11 in `_profile.scss`.  the current image tests in the public folder are results of the convert command noted.
 2012-05-06 12:35:10 -07:00
danielgrippi
e5bb4216f9 clean up dom on post viewer; use circles instead of weird semi-rounded boxes to be consistent 2012-05-05 19:55:38 -07:00
Sean Tilley
96af3ed944 Merge pull request #3224 from SuperTux88/add-paragraph-margin 
Add small margin for paragraphs [ci skip]
 2012-05-05 02:12:08 -07:00
danielgrippi
a5f34e67c7 made favicon sexier; extracted form-block into its own custom class; made the title of pages less caps-lock. 2012-05-04 21:25:50 -07:00
Benjamin Neff
a47e239d8e Add small margin for paragraphs [ci skip] 2012-05-05 03:47:54 +02:00
danielgrippi
5821a84024 validations and all that jazz [ci skip] 2012-05-04 17:38:08 -07:00
danielgrippi
31af414a04 actually use labels, html5 validations, etc [ci skip] 2012-05-04 17:38:08 -07:00
danielgrippi
bae47a10eb use layout in our actual controller. derp. [ci skip] 2012-05-04 17:38:07 -07:00
danielgrippi
40347038f8 DG RY; mostly done, validations pending [ci skip] 2012-05-04 17:38:07 -07:00
Dennis Collinson
9f930a9ba8 change margin on sticky notes [ci skip] 2012-05-04 13:31:17 -07:00
Sean Tilley
5529b640dc Adding a z-index to post interactions may have been totally premature 2012-05-03 19:36:29 -05:00
Sean Tilley
2d6a7b1da1 Fix show page CSS so that hashtags and links are clickable on wallpaper posts 2012-05-03 18:19:01 -05:00
danielgrippi
2d3edbf74f pulsate control to add new post if no posts present 2012-05-02 22:05:40 -07:00
danielgrippi
bc81c6985a hover state on info in profile [ci skip] 2012-05-02 21:06:55 -07:00
danielgrippi
1b92fe7e7f use zoom-in / zoom-out cursors to signify favoriting [ci skip] 2012-05-02 21:02:10 -07:00
Florian Staudacher
d31ea8f2bd use back-to-top initializer, fixes #2840 2012-05-02 00:03:07 +02:00
danielgrippi
2acc52375d small css tweak with info shade box shadow grossness [ci skip] 2012-04-29 11:58:23 -07:00
Maxwell Salzberg
fcc18fa776 use cover for background-image [ci skip] 2012-04-28 17:58:48 -07:00
danielgrippi
accd507f36 logout button on your profile [ci skip] 2012-04-28 11:51:27 -07:00
danielgrippi
cf85f15fcc add padding around the composer box [ci skip] 2012-04-28 11:09:28 -07:00
danielgrippi
699b0cff16 don't expose follow/unfollow to a user in the UI 
following is good for bookkeeping in the database, but provides confusion, and could limit likes and/or commenting to start receiving notifications in a conversation.
 2012-04-28 11:07:18 -07:00
danielgrippi
8d08f2604b added a follow button on others' profile pages [ci skip] 2012-04-27 20:59:44 -07:00
danielgrippi
7f4af0359f add bootstrap tooltips for great justice (and clarity) [ci skip] 2012-04-27 20:45:26 -07:00
danielgrippi
889b86f9cb implicitly expand / contract a post by clicking on it. use the permalink icon to go to the show page. (user tested, mother approved) 2012-04-27 19:38:06 -07:00
danielgrippi
05683de16b removed some old assets; added a link to profile edit next to quick stats on a profile page 2012-04-27 17:41:59 -07:00
Maxwell Salzberg
6b115a7d22 update backgound-size declaration for skinny images 2012-04-27 16:19:13 -07:00
Maxwell Salzberg
592a3f99b5 Role system to replace the yml admins and community spotlight. we can 
also now add a beta role
 2012-04-27 16:14:43 -07:00
danielgrippi
7fafb0e3b2 DG RY; publisher css tweaks 2012-04-27 14:58:07 -07:00
Maxwell Salzberg
0f15c3e0b0 add z-index to home button, and some small whitespace junk [ci skip] 2012-04-26 21:43:21 -07:00
Maxwell Salzberg
fb4ad72378 composer is much cooler 2012-04-26 20:30:17 -07:00
Maxwell Salzberg
c3ef944878 push publisher form box up [ci skip] 2012-04-26 20:30:17 -07:00
danielgrippi
c413a494d7 retina-ify icons; fix 404 scrolling issue; serif -> san-serif in some style [ci skip] 2012-04-26 20:25:25 -07:00
danielgrippi
c9d0879d3d fav by clicking on something yeahhhh 2012-04-26 18:39:43 -07:00
danielgrippi
f08a539c23 clicking the pin icon on the profile takes you to a map [ci skip] 2012-04-26 17:53:36 -07:00
Maxwell Salzberg
c6da8e74ad background-size for fun and profit [ci skip] 2012-04-26 16:45:46 -07:00
danielgrippi
0b3926d810 fixed / removed some assets [ci skip] 2012-04-26 15:23:51 -07:00
danielgrippi
152101484c updated some assets, THX RO. [ci skip] 2012-04-26 15:02:59 -07:00
Maxwell Salzberg
6d2cd31e73 disable framer button when you click it the first time. 2012-04-26 15:00:55 -07:00
danielgrippi
d3b874b020 add basic profile info to profile; remove random console.logs [ci skip] 2012-04-26 14:52:48 -07:00
Maxwell Salzberg
b387f89164 make composer not clip in both views [ci skip] 2012-04-26 12:46:04 -07:00
danielgrippi
43518a9447 added home button nav on profile page [ci skip] 2012-04-26 12:29:22 -07:00
Maxwell Salzberg
adebdcbd2a fix an incorrect size declaration in a mixing [ci skip] 2012-04-25 23:08:32 -07:00
Maxwell Salzberg
87464b84d0 please do not set !important on a global link rule kthxbai 2012-04-25 23:07:56 -07:00
Maxwell Salzberg
3bce0be47c simple hack to make bigtexts posts less sadface [ci skip] 2012-04-25 18:10:43 -07:00
danielgrippi
6933eeb675 show reshared people on hover [ci skip] 2012-04-25 17:23:16 -07:00
Maxwell Salzberg
7c9aaa0a68 fix some stray margin [ci skip] 2012-04-25 17:06:31 -07:00
danielgrippi
04abaf3523 don't show info in edit mode [ci skip] 2012-04-25 17:03:05 -07:00
danielgrippi
4e14dd2d01 info now comes from above; slightly fixed typography on single post view 2012-04-25 16:48:06 -07:00
Dennis Collinson
76ad02f2a5 hella spinners 2012-04-25 14:13:16 -07:00
Dennis Collinson
7346921473 MS DC; you can now kill a post on your profile. 2012-04-24 20:46:09 -07:00
danielgrippi
b2ab11944e changed play button for videos [ci skip] 2012-04-24 19:54:09 -07:00
danielgrippi
c82e339640 follow button in [ci skip] 2012-04-24 19:40:33 -07:00
danielgrippi
9853197063 only show edit and new post controls if you're on your profile page 2012-04-24 19:24:45 -07:00
danielgrippi
ec096f8131 remove some opacity stuff; fix isotope pagination [ci skip] 2012-04-24 18:55:33 -07:00
danielgrippi
570de98365 animate isotope! and inject image height in relation to ratio for quicker organization. [ci skip] 2012-04-24 16:38:17 -07:00
Dennis Collinson
8149648e5b MS DC; youtube videos now display thumbnail, and sound cloud embeds are not total train wrecks; 2012-04-24 16:18:00 -07:00
danielgrippi
44f28b8220 don't randomly fav things; fix wallpaper text on profile [ci skip] 2012-04-24 14:21:18 -07:00
danielgrippi
a659b4daf8 forgot about one other class case for font styling [ci skip] 2012-04-24 14:13:32 -07:00
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
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
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
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
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
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
Maxwell Salzberg
85f2f13d79 more color [ci skip] 2012-04-23 12:23:10 -07: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
Dennis Collinson
afc26c684b DC MS infinite scroll with isotope on new profile page. boom! 2012-04-22 16:46:39 -07:00