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

1705 commits

Author SHA1 Message Date
Gonzalo Rodriguez
c7c46d2b7b Update edit form after aspect rename. Closes #2363. 2011-12-07 01:57:04 -02:00
Daniel Grippi
0d41c9c5f3 update gems -- mainly omniauth (we explicitly include omniauth libs now... much cleaner) 2011-12-05 19:53:03 -08:00
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Pistos
aa0aaa2f92 Revert "Merge pull request #2428 from geckoxx/comment_stream" 
This reverts commit 8a27568273, reversing
changes made to 31ef2d60f7.

Conflicts:

	app/helpers/stream_helper.rb
	app/views/aspects/index.html.haml
	config/locales/diaspora/en.yml
	config/routes.rb
	spec/lib/stream/comments_spec.rb
 2011-11-30 22:22:32 -05:00
Daniel Grippi
682d45d9bd Merge pull request #2426 from geckoxx/like_stream 
Like stream
 2011-11-30 09:11:17 -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
Johannes Hackel
23fa7a0a3e like stream new 2011-11-29 17:27:09 +01:00
Daniel Grippi
161d9d527c Merge pull request #2270 from fermionic/allow-photo-views-in-mobile 
re-enable photo viewing on mobile
 2011-11-28 11:03:13 -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
Daniel Grippi
a4027f3d22 Merge pull request #2417 from jperyl/2284-display-user-handle-in-hovercard-2 
Issue #2284: simple fix
 2011-11-28 09:32:41 -08:00
Johannes Hackel
7368bb9e62 comment_stream 2011-11-20 18:37:10 +01:00
Jake Peryl
07f05ebead Issue #2284: simple fix 2011-11-17 01:22:01 +01:00
Jonne Hass
74582fe07d Merge pull request #2340 from manuels/userignore_icon 
Modified "Ignore user" icon
 2011-11-16 10:48:55 -08:00
Jonne Hass
09bad3a7f6 Merge pull request #2314 from Pistos/svg-to-png 
Converted all [used] SVG graphics to PNG.
 2011-11-16 10:45:33 -08:00
Manuel Schölling
845acc6120 Made Ilya's profile static 2011-11-15 20:55:44 +01:00
danielgrippi
9fa01f9427 serve splash page image out of cloudfront CDN 2011-11-14 18:18:40 -08:00
danielgrippi
6be778b9b2 change root_path and root_url to multi_path 2011-11-14 18:01:09 -08:00
Kevin Fitzpatrick & Michael Sofaer
51ba939875 for now, check in index as a flat file 2011-11-14 17:16:13 -08:00
Michael Sofaer & Sarah Mei
0c33791069 Image for Ilya 2011-11-14 12:27:12 -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
Pistos
ae07b7c559 Publisher: Hook up same "after keypress" handler to "after mouse click", because the text can change without any keypresses (paste, etc.). 2011-11-10 11:38:39 -05:00
Pistos
5f73cdc67d Only show post deletion spinner when the AJAX call actually gets underway (i.e. not when the user cancels the deletion). 2011-11-10 00:50:43 -05:00
Jonne Hass
22dc8f44ef fixed notification counter increment via websocket 2011-11-09 17:26:16 +01:00
Sarah Mei
0f9e82eea1 Merge pull request #2358 from Pistos/issue-2353-ie-photo-zoom 
IE: Open images in a new tab, no lightbox
 2011-11-08 21:05:52 -08:00
Pistos
c592997fce Skip lightbox when clicking (non-cubbies) images in IE. Just open the image in a new tab. 
This is because the lightbox doesn't work in IE.
 2011-11-08 23:54:40 -05:00
Pistos
611aa339fc Don't use a dropdown for notifications in IE (because it doesn't render properly). Just go to notifications URL on click. 2011-11-08 22:25:51 -05: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
3e9efad9d6 Fixed icon path of 'Ignore User' icon and converted to .png 2011-11-07 21:15:33 +01:00
Jonne Hass
1d0109d4cb fix timeago widget 2011-11-07 16:33:38 +01:00
Pistos
14842c1b43 Merge remote-tracking branch 'johnedmonds/issue1144' 2011-11-06 22:21:53 -05:00
Manuel Schölling
99d51b72e8 Modified "Ignore user" icon 2011-11-07 00:15:41 +01:00
Dan Hansen & Maxwell Salzberg
2a4abc5483 show service icons on mobile site 2011-11-05 13:23:29 -05:00
Ricardo
ab4446e063 kill transparency in header gradient 2011-11-05 14:53:03 +08:00
Pistos
b4c182b29a Moved unused SVG files to a new graphics/ folder. 2011-11-04 09:29:29 -04:00
Pistos
af82fb1600 Total hax, but this is better than the user menu completely not working. 2011-11-04 01:22:57 -04:00
Pistos
db94689dfa Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice. 2011-11-03 23:56:56 -04:00
Pistos
a6d27e2bb5 Revert "Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice." 
This reverts commit 5c8ddc3ea6.
 2011-11-03 23:54:23 -04:00
Pistos
5c8ddc3ea6 Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice. 2011-11-03 23:44:46 -04:00
danielgrippi
b56dc9205b added ignore text on user pages if it applies 2011-11-03 12:31:25 -07: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
ae7944418c DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams 2011-11-03 12:31:24 -07:00
Dan Hansen
066f8d1235 Mention the person who invited a user on first message 2011-10-31 22:16:58 -05:00
danielgrippi
3118f7a019 up the timeout even more on search autocomplete 2011-10-31 18:55:35 -07:00
danielgrippi
3845010be6 double the delay for search 2011-10-31 17:36:20 -07:00
Zach Prezkuta
2f69737014 re-enable photo viewing on mobile 2011-10-28 17:10:20 -06:00