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

1817 commits

Author SHA1 Message Date
danielgrippi
02ca7a32f0 added reshare logic back (doesn't append it to the stream...) 2012-01-07 14:23:25 -08:00
danielgrippi
027bb3dee7 removed content-updater widget; better tests around likes on feedback widget; extend the defaultPresenter return value instead of passing the function in Feedback view 2012-01-07 14:23:25 -08:00
danielgrippi
505adbe07b aspect stream uses backbone; don't ajax in aspect selectors for now 2012-01-07 14:23:25 -08:00
danielgrippi
4029b26c03 created publisher view; wip 2012-01-07 14:23:25 -08:00
danielgrippi
b120faa4f9 took some functions out of stream-element widget; refactored Header view; refactored tooltip logic in Post view 2012-01-07 14:23:25 -08:00
danielgrippi
1a5e493b22 downcase namespacing of app 2012-01-07 14:23:25 -08:00
danielgrippi
6ad4c8e348 loadMore -> render (Stream view); add #paginate div if not already present in addLoader 2012-01-07 14:23:25 -08:00
danielgrippi
79208e9073 CommentStream inherits from Base view; using subviews in Post view; be a little smarter about bindAll in Stream view 2012-01-07 14:23:25 -08:00
danielgrippi
039df8f879 fixed 14 cukes (all comments features) 2012-01-07 14:23:25 -08:00
Dennis Collinson
f5609f2182 App views base renders subviews like magic 2012-01-07 14:23:24 -08:00
danielgrippi
7c5e3cb415 switch like_stream to use backbone 2012-01-07 14:23:24 -08:00
danielgrippi
31d24c60c7 added spec for .like_action link being rendered; added comments div back to stream_element for now 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
828624f392 slightly fade in stream elements; made a better spinner for the stream (css3) 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
1ffdfa8465 DC DG; created feedback view; moved jasmine fixtures; modified jasmine spec helper; jasmine is green 2012-01-07 14:23:24 -08:00
danielgrippi
03aa7d9d5f remove duplicate declaration 2012-01-07 14:23:24 -08:00
danielgrippi
67e56dce2c backbone view for header; moved user dropdown logic in there; moved jasmine specs over; removed old widget 2012-01-07 14:23:23 -08:00
danielgrippi
6911ed5d7d expand comments working 2012-01-07 14:23:23 -08:00
danielgrippi
574eb7b12d removed App.Views.PostContent in lieu of StreamObject; moved some view logic to where it should be 2012-01-07 14:23:23 -08:00
danielgrippi
c6e4172926 fixed likes_controller; half of the failing jasmine tests 2012-01-07 14:23:23 -08:00
Dennis Collinson
a7627fabea pulling more view logic into superclass 2012-01-07 14:23:23 -08:00
danielgrippi
b94b5240a8 added block user functionality to the stream 2012-01-07 14:23:23 -08:00
danielgrippi
6760e3868d remove js resposne for likes, do it in backbone with json responses instead 2012-01-07 14:23:23 -08:00
danielgrippi
d9d878f11f added api response for likes; cleaned up view logic; specify like collection url from parent model (Post) 2012-01-07 14:23:23 -08:00
danielgrippi
ae6fa5bebb don't use Diaspora widget system or stream.js when backbone is active; 
migrating like actions over to backbone; some cleanup; bump jquery to
1.7.1
 2012-01-07 14:23:22 -08:00
danielgrippi
cd1d25dc30 remove widget references on backbone stream pages; don't call time_for_stream if @backbone (the method references @stream.stream_posts) 2012-01-07 14:23:22 -08:00
danielgrippi
dc82316f13 bind Twipsy in stream_element_view.js 2012-01-07 14:23:22 -08:00
danielgrippi
525fd3c4e4 make views associated in stream inherit from App.Views.StreamObject (location of shared deletion function) 2012-01-07 14:23:22 -08:00
danielgrippi
f5172fa977 comment and post deletion now works on the backbone stream 2012-01-07 14:23:22 -08:00
danielgrippi
46b1567622 added loader gif when 'more' is clicked in stream; fixed nsfw positioning 2012-01-07 14:23:22 -08:00
danielgrippi
ffae0f8e85 added more jasmine spec; NSFW wip 2012-01-07 14:23:22 -08:00
danielgrippi
bc1ffd317e reference 'el' explicitly (render methods now return this instead of this.el); comment area focusing working again 2012-01-07 14:23:22 -08:00
danielgrippi
e6d4ec2dc8 added as::photo view 2012-01-07 14:23:21 -08:00
danielgrippi
34e3403e2e jasmine green again; template switching in place, defaulting to displaying post text 2012-01-07 14:23:21 -08:00
Dennis Collinson
8e3db3aebe make jasmine view tests work, load templates, party 2012-01-07 14:23:21 -08:00
danielgrippi
52e3f1b240 DC DG; test stream view WIP 2012-01-07 14:23:21 -08:00
danielgrippi
f62b26fc73 put the frontend into its own folder; only use one routes file 2012-01-07 14:23:21 -08:00
danielgrippi
1ecfa92c9e DH DG; create comments via backbone 2012-01-07 14:23:21 -08:00
danielgrippi
3f7d992a0b DH DG; added new routes for streams; fixed pagination 2012-01-07 14:23:21 -08:00
Dan Hansen
80f797a581 introduce comments 2012-01-07 14:23:21 -08:00
Dan Hansen
ba9ece0014 Use routers, remove some hacks 2012-01-07 14:23:21 -08:00
Daniel Grippi
d4219799e4 namespace view, model, and collection under App 2012-01-07 14:23:20 -08:00
Daniel Grippi
dca3581ae2 added likes to the stream element underscore partial 2012-01-07 14:23:20 -08:00
Daniel Grippi
d504bf4591 add current user to body tag data field (hackity hack). add comment links to posts 2012-01-07 14:23:20 -08:00
Daniel Grippi
176963fdad serialize current user json into body tag for now 2012-01-07 14:23:20 -08:00
Daniel Grippi
19db5519c0 DG DH; made acts_as_api play nice with backbonejs. comments are semi-functional; stream elements use the StreamElement js widget (for now). 2012-01-07 14:23:20 -08:00
danielgrippi
42ce3b277b backbone all the streams, besides user. don't use the acts_as_api way for now. 2012-01-07 14:23:20 -08:00
danielgrippi
2a13381773 DG DH; pagination on backbone stream 2012-01-07 14:23:20 -08:00
danielgrippi
c360e82f11 DG DH; backbone stream now sort-of renders on multis_controller; wip 2012-01-07 14:23:20 -08:00
Maxwell Salzberg
a7eb135ad0 peace bro 2012-01-05 18:31:00 -08:00
Chase Reid
2f948eec4f instead of redirecting to regular joindiaspora u just go 2 the site 2012-01-05 17:35:10 -05:00
Florian Staudacher
03ff3bc45d this fixes #2567 (again), but this time it should cover all possible content lengths. 
the hovercard grows with the content up to 400px, then cuts it off and appends '...'
 2012-01-02 16:56:41 +01:00
Steven Fuchs
95b553f953 notifications popup menu should use functions from regular notification object. 2011-12-23 23:01:18 -05:00
Steven Fuchs
02531337cb break actions into separate functions. Make css changes happen inside the completion functions 2011-12-23 23:00:16 -05:00
Steven Fuchs
f23ac92b1e notification elements should have a hover state since they are live. 2011-12-23 22:58:38 -05:00
Steven Fuchs
1519cdd672 new parameter name and fix to notification badge css 2011-12-22 22:57:33 -05:00
Steven Fuchs
4d6f53401b makes sure that the large notification count badge on the notifications page gets incremented and decremented. Not the neatest solution since this code can be called from many pages, but shouldn't cause any problems in that case. 2011-12-22 15:57:59 -05:00
Steven Fuchs
b6dd14a968 clicking on notifications takes note of the current UI state and makes sure that the resulting 'read' state matches the users expectation. 2011-12-22 15:56:03 -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
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