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

877 commits

Author SHA1 Message Date
Jonne Haß
54cb3ea3cb more than 100% height <3, fix #2710 [ci skip] 2012-01-22 14:01:21 +01: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
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
Steven Fuchs
aae5fe04ce css for marking as unread, and hook for notification page to be part of it when called. 2012-01-17 19:21:25 -05:00
Florian Staudacher
81ae0c644c start using new placeholders on login page 2012-01-18 01:17:20 +01:00
Maxwell Salzberg
2735f531f4 make search box readable when you are typing stuff into it [ci skip] 2012-01-14 00:46:14 -08:00
danielgrippi
1efce2cede Revert "Merge pull request #2547 from stwf/unread_notifications" 
This reverts commit c61e84bc50, reversing
changes made to b88899ff2a.
 2012-01-11 12:11:00 -08:00
Daniel Grippi
c61e84bc50 Merge pull request #2547 from stwf/unread_notifications 
Allow users to click on read notifications to mark them as unread
 2012-01-10 10:46:26 -08:00
danielgrippi
779de03111 added alpha mark to asterisk in the header 2012-01-09 16:43:24 -08:00
Judy Tuan
e36673c1dd https://github.com/diaspora/diaspora/issues/2570 says "This can easily be fixed by adding overflow: hidden to the CSS class .avatar." so I added '''':overflow hidden'''' to .avatar. 2012-01-08 18:33:40 -08:00
danielgrippi
2024716c2c remove unusued javascript files; GC clearing from application/vanna controller 2012-01-07 14:24:27 -08:00
danielgrippi
dd85521701 fix header styling when not signed in; remove ilya's static page 2012-01-07 14:23:27 -08:00
danielgrippi
565a0b21f7 fix .avatar declaration in the header template; make socketing always return nil straight away (we are not using the websocket in this branch, and it makes everything faster when it's off) 2012-01-07 14:23:26 -08:00
danielgrippi
7c5e3cb415 switch like_stream to use backbone 2012-01-07 14:23:24 -08:00
danielgrippi
7f51bc02ef grey left nav 2012-01-07 14:23:24 -08:00
danielgrippi
1b8f78e006 remove sort order logic from controllers; backbone stream does not support it; was to be depricated anyway 2012-01-07 14:23:24 -08:00
danielgrippi
193e5d61c5 adding some texture to the header to distinguish the branch 2012-01-07 14:23:24 -08:00
danielgrippi
46b1567622 added loader gif when 'more' is clicked in stream; fixed nsfw positioning 2012-01-07 14:23:22 -08:00
Steven Fuchs
f23ac92b1e notification elements should have a hover state since they are live. 2011-12-23 22:58:38 -05:00
Maxwell Salzberg
8f8769aab5 basic NSFW filtering for authors who say their post is nsfw 2011-12-08 18:22:27 -08:00
Maxwell Salzberg
90458381f5 basic page for deleting account with temporary text and cute cat picture 2011-12-08 16:32:20 -08:00
Daniel Grippi
ee618714df Merge pull request #2400 from pixelistik/patch-1 
Let notification dropdown action links float so they don't overlap with the heading. [ci skip]
 2011-11-29 09:52:35 -08:00
Daniel Grippi
a672dfc787 Merge pull request #2319 from rekado/2173-oembed-overlapping-css-fix 
Fix issue #2173 (oembed overlapping top bar) // CSS approach
 2011-11-28 09:39:10 -08:00
Jonne Hass
74582fe07d Merge pull request #2340 from manuels/userignore_icon 
Modified "Ignore user" icon
 2011-11-16 10:48:55 -08:00
pixelistik
1ad85a3149 Let dropdown action links float so they don't overlap with the heading. 2011-11-14 19:33:50 +01:00
Dennis Schubert
ddedf73e59 Merge pull request #2344 from 21echoes/padded_profile 
padded profile
 2011-11-12 03:51:37 -08:00
Ilya Zhitomirskiy
e1253c4018 fade in on hover, larger x on the welcome div 2011-11-07 23:11:48 -08:00
Ilya Zhitomirskiy
d1d24a049c added close buttons which clear getting started when they're all closed 2011-11-07 21:59:29 -08:00
Ilya Zhitomirskiy
15e7a0cc6e pop-over close buttons, wip 2011-11-07 21:59:29 -08:00
David Kettler
238a8f74d0 padding on the right side of the profile navigation so it looks not shitty 2011-11-07 21:19:14 -08:00
Manuel Schölling
99d51b72e8 Modified "Ignore user" icon 2011-11-07 00:15:41 +01:00
Ricardo
ab4446e063 kill transparency in header gradient 2011-11-05 14:53:03 +08:00
Pistos
af82fb1600 Total hax, but this is better than the user menu completely not working. 2011-11-04 01:22:57 -04:00
danielgrippi
07f713f46c change 'mute' to 'ignore' for now; fix specs; repopulate cache upon 
contact removal
 2011-11-03 12:31:24 -07:00
danielgrippi
ee5bc25faf DH DG; don't display blocked people in stream; switch controls in stream; disallow blocking yourself 2011-11-03 12:31:24 -07:00
danielgrippi
0def71d74f add some feedback text & animation; added spec for collapsing tags 2011-10-27 19:57:00 -07:00
danielgrippi
e8169ee581 follow tag from sidebar 2011-10-27 18:42:20 -07:00
danielgrippi
c8fc9fcb76 fixed spinny location on getting_started 2011-10-27 18:03:09 -07:00
danielgrippi
b879070744 avatars for likes 2011-10-26 23:50:01 -07:00
danielgrippi
f204910aa4 add 'mark all as read' on notification dropdown 2011-10-25 17:33:57 -07:00
danielgrippi
0512ade65a made name smaller and clickable on aspects/index [ci skip] 2011-10-24 21:43:32 -07:00
danielgrippi
28e08fb6a3 show actual screenshots of diaspora mobile on logout; supress log out flash message; bootstrap on logged out page (can we get d* shots in wp7 and android emulators?) 2011-10-24 20:51:16 -07:00
danielgrippi
0033237b4e made flash messages awesome this time 2011-10-24 17:33:18 -07:00
danielgrippi
0874a632f4 make gs dismissal icon translucent 2011-10-24 16:11:26 -07:00
danielgrippi
e63e8299b9 fixed up stream/publisher logic; fixed cukes 2011-10-24 14:41:15 -07:00
danielgrippi
59e4955727 added translation keys; some css cleanup 2011-10-24 14:11:36 -07:00
danielgrippi
1bc637d83f new getting started works, needs more love 2011-10-24 14:11:35 -07:00
danielgrippi
547d7e4f8c bootstrapped getting started page 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
e7584261c7 removeing the tooltips after submit 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
050964b7ec photo upload position, active input, spinny on complete 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
49b46f09cd Saving of first name 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
511bd3ab03 added a save button, moved stuff around 2011-10-24 14:11:34 -07:00
danielgrippi
42d4d4f400 down to two steps; wip. 2011-10-24 14:11:34 -07:00
danielgrippi
794247d07b MS DG; rename soup to stream; fix a bunch of translations 2011-10-21 14:44:02 -07:00
danielgrippi
79ec50a16c DG MS; added setting for displaying spotlight members in soup stream 2011-10-21 14:44:02 -07:00
danielgrippi
1256b6f3fc DG MS; changed coloring of indicators; changed indicator precidence; added soup link 2011-10-21 14:44:01 -07:00
Maxwell Salzberg
defaba504a functional 'show me where this post came from' in soup 2011-10-21 14:44:01 -07:00
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
Maxwell Salzberg
9bf60d71e4 make sign up pages ppretty 2011-10-20 11:26:40 -07:00
danielgrippi
ed473e0f46 touch up welcome page 2011-10-19 18:44:09 -07:00
Gonzalo Rodriguez
66f79b13ed Minor aspect_listings cleanup 2011-10-19 00:02:37 -02:00
Gonzalo Rodriguez
b38325c016 Style aspect-nav toggle-selector same as new_aspect link 2011-10-17 23:33:36 -02:00
Gonzalo Rodriguez
c694b4aa4e Oops, remove only boldness, keep dark color of aspect selectors 2011-10-12 00:01:38 -02:00
Gonzalo Rodriguez
b973b66890 Remove boldness from aspect selectors 2011-10-11 20:51:58 -02:00
danielgrippi
f472bfa661 fix notification dropdown positioning 2011-10-11 10:20:46 -07:00
danielgrippi
a2b79d0338 touch up header 2011-10-11 08:00:36 -07:00
danielgrippi
2ef56224be DG MS; added more feedback to photo uploader 2011-10-10 16:35:18 -07:00
danielgrippi
882c0c2170 DG MS; fixed tags autocomplete styling and js 2011-10-10 15:59:13 -07:00
Maxwell Salzberg
2b22e1dab5 make the links on featued users tile be the tag with the name in the link. added a following count to tags 2011-10-07 12:19:28 -07:00
Gonzalo Rodriguez
8b865375ca Tiny refactor on left_nav styles. More needed. 2011-10-06 23:49:36 -02:00
Pistos
ef29d120fc Put some space between paragraphs in comments, to make them more easily distinguishable. 
Since this is styling, it works retroactively on all existing comments, too!
 2011-10-06 18:17:42 -04:00
Pistos
eb9b94b2bd Whitespace cleanup. 2011-10-06 18:17:24 -04:00
Your Name
619f5fd56e move featured users to the other side and make a little sidebar widget for it 2011-10-06 12:27:02 -07:00
Gonzalo Rodriguez
04b51cced8 Merge branch '1584-aspects-list' 2011-10-06 01:52:53 -02:00
Gonzalo Rodriguez
977c12e2b8 Fix aspect contacts count alignment 2011-10-06 01:51:18 -02:00
Maxwell Salzberg
d8d3996f75 small css fix to fix the super wonky stuff on the aspect edit pane. still needs more love but this is way better 2011-10-05 14:34:53 -07:00
Gonzalo Rodriguez
1f2d37cc93 Dont use checkmarks when hovering 2011-10-04 23:39:40 -02:00
Markus Unterwaditzer
7e0449bb1e Fix #1584 Pseudo-checkboxes in aspect list 2011-10-04 23:27:04 -02:00
Gonzalo Rodriguez
d3a5bc1fb8 Merge branch 'master' into aspect_nav_rework 2011-10-01 03:58:50 -03:00
Maxwell Salzberg
f8a968bf52 fix some stupid markdown formatting that was bothering me 2011-09-29 12:34:04 -07:00
Gonzalo Rodriguez
e0ffd7c63e Merge branch 'master' into aspect_nav_rework 
Conflicts:
	features/posts_from_main_page.feature
	public/javascripts/aspect-filters.js
	spec/javascripts/aspect-filters-spec.js
 2011-09-27 00:08:05 -03:00
Ilya Zhitomirskiy
f9172c8733 added aspect dropdown to the getting started page, renamed the button to be add contact 2011-09-26 17:32:37 -07:00
Ilya Zhitomirskiy
675908a57d added an expanation of what connecting services does(getting started), also indicate services whick are connected connected services 2011-09-26 16:04:25 -07:00
bdjnk
1e1fe011e1 Ensures that the back-to-top button remains on top and won't be covered by images on small screens. 2011-09-26 14:26:40 -07:00
danielgrippi
131166841a added logged out page referencing mobile 2011-09-25 11:58:44 -07:00
Ilya Zhitomirskiy
461cb22109 in the getting started featured tags are now followable 2011-09-23 17:06:21 -07:00
Gonzalo Rodriguez
181bc6cd57 Dim a little bit separation bar. Closes #1936. [ci skip] 2011-09-13 23:38:37 -03:00
Gonzalo Rodriguez
2947ee46f4 Bold titles on profile information sidebar. Closes #1934. 2011-09-13 00:04:51 -03:00
Gonzalo Rodriguez
04786bc43e Improvements on aspect navigation rework 2011-09-08 02:13:15 -03:00
Gonzalo Rodriguez
1a6ee84ed5 Refactor aspect listings partial. Splited in two, one for index and 
other for contacts.
 2011-09-07 00:09:39 -03:00
danielgrippi
b6e2647530 remove sass warnings 2011-09-04 23:13:03 -07:00
danielgrippi
341d105e75 updated buttons, mixin declarations 2011-09-04 22:48:37 -07:00
vcuculo
9072de5096 fixed bookmarklet 2011-09-02 10:25:34 +02:00
danielgrippi
af569204b8 Revert "Merge pull request #1874 from vcuculo/1785-fix-bookmarklet" 
This reverts commit e278b39421, reversing
changes made to d0f21cb444.
 2011-09-01 16:31:49 -07:00
Maxwell Salzberg
e278b39421 Merge pull request #1874 from vcuculo/1785-fix-bookmarklet 
Fixed bookmarklet
 2011-09-01 16:20:59 -07:00
Maxwell Salzberg
d0f21cb444 small fix for lists in comments 2011-09-01 16:20:13 -07:00