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

1669 commits

Author SHA1 Message Date
Markus Unterwaditzer
7e0449bb1e Fix #1584 Pseudo-checkboxes in aspect list 2011-10-04 23:27:04 -02:00
Maxwell Salzberg
9cc7523f0e fix the time on the conversation view 2011-10-04 18:20:14 -07:00
Maxwell Salzberg
dfd65c4b4b prevent publisher on mentions and tags from crashing 2011-10-04 16:54:41 -07:00
danielgrippi
1d818fdc23 added reshare to mobile site 2011-10-03 17:02:23 -07:00
Maxwell Salzberg
429ac42502 added tag follow feature, mention page feature. is now pretty easy to add new types of streams, but some more refactoring could make it even nicer 2011-10-03 15:22:14 -07:00
Gonzalo Rodriguez
0b97a3525a Merge branch 'aspect_nav_rework' 2011-10-02 21:08:12 -02:00
danielgrippi
9672c27232 using two less delegates in mobilejs; made some partials for mobile stream elements for sanity's sake 2011-10-02 12:27:14 -07:00
Gonzalo Rodriguez
d3a5bc1fb8 Merge branch 'master' into aspect_nav_rework 2011-10-01 03:58:50 -03:00
Maxwell Salzberg
11cbf3bc84 Merge pull request #2060 from wcs/hovercard-issues 
Fix bug #2008
 2011-09-29 18:15:45 -07:00
Maxwell Salzberg
f8a968bf52 fix some stupid markdown formatting that was bothering me 2011-09-29 12:34:04 -07:00
danielgrippi
6b73527379 vcuculo's fixes (flattened mobile.scss into mobile boilerplate's css instead of just flipping the load order) 2011-09-29 10:19:03 -07:00
danielgrippi
ae1fd49954 force hardware acceleration for speedier typing on mobile webkit browsers 2011-09-28 23:26:00 -07:00
Gonzalo Rodriguez
389136eaf2 Show all aspects selected by default 2011-09-28 22:35:33 -03:00
Gonzalo Rodriguez
74d00d7db4 Merge branch 'master' into aspect_nav_rework 2011-09-28 19:52:15 -03:00
danielgrippi
d2d205ee08 make autoexpand work 2011-09-28 11:21:14 -07:00
danielgrippi
42fcf3e394 reshares up top 2011-09-27 21:32:11 -07:00
danielgrippi
7d662fcc92 move share button to top right corner 2011-09-27 21:09:28 -07:00
danielgrippi
f34f0ce5fb expand/collapse comments with animation; added collapse link on bottom 2011-09-27 21:09:27 -07:00
danielgrippi
64113eb8f2 increment counter on comment add 2011-09-27 21:09:27 -07:00
danielgrippi
beb5380ada enable webkit hardware acceleration for css shadows 2011-09-27 21:09:27 -07:00
danielgrippi
51c7e879de use deletage instead of live; bind where we don't need to delegate 2011-09-27 21:09:27 -07:00
danielgrippi
9b057bdf16 added placeholder; force autofill off on comment fields; touched up mobile reshare view 2011-09-27 21:09:27 -07:00
danielgrippi
744ab579bd adding comments work for one of two comment add buttons; added info on 
posts; post show page.
 2011-09-27 21:09:27 -07:00
danielgrippi
3b08fc8406 wip 2011-09-27 21:09:27 -07:00
danielgrippi
ea357a96ef expand&collapse comments; added comment form (wip) 2011-09-27 21:09:27 -07:00
danielgrippi
9d72247e9e mobile tags page 2011-09-27 21:09:27 -07:00
danielgrippi
7acb48ff7a add lighting on more button 2011-09-27 21:09:26 -07:00
danielgrippi
d972802142 comment ajax on mobile. 2011-09-27 21:09:26 -07:00
danielgrippi
91c9fffb81 touched up login page wip 2011-09-27 21:09:26 -07:00
danielgrippi
f2f14c2894 fixed ajax for likes 2011-09-27 21:09:26 -07:00
danielgrippi
6deb924c32 fixed header; compose message on top right 2011-09-27 21:09:26 -07:00
danielgrippi
645af37358 more touchup; added placeholder for reaction tabs on post show; added more mobile boilerplate / compatability; apple splash page asset 2011-09-27 21:09:26 -07:00
danielgrippi
9e3ff7338e ditch unused css rules; move js to body bottom 2011-09-27 21:09:26 -07:00
danielgrippi
00e561dd01 comments -> reactions 2011-09-27 21:09:26 -07:00
danielgrippi
8c586c4567 added html5 boilerplate meta tags to mobile; stripped functionality to add back 2011-09-27 21:09:25 -07:00
Gonzalo Rodriguez
372a472fbf Empty aspect stream when no aspect selected on the left nav 2011-09-27 23:46:02 -03:00
Wilmar Cesar Santos
1f63860f0e Fix bug #2008 2011-09-27 13:32:08 -04:00
Gonzalo Rodriguez
dc0c23da2f Slight enhacements on aspect-navigation widget 2011-09-27 03:09:48 -03: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
d36da2a266 ms iz made the aspect stream ajax in 2011-09-26 19:34:35 -07: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
John Edmonds
8a44b384c0 Add CSRF token to forms generated by fileuploader. 
Diaspora added an X-CSRF-Token header to XHR made by fileupload.
Since fileupload doesn't think Opera supports XHR, it builds a form and submits that instead.
By adding a hidden authenticity_token to the form, Opera can submit the form without logging the user out.
 2011-09-25 11:09:01 -04:00
Ilya Zhitomirskiy
720721633c added the image 2011-09-23 17:07:03 -07:00
Ilya Zhitomirskiy
461cb22109 in the getting started featured tags are now followable 2011-09-23 17:06:21 -07:00
Ilya Zhitomirskiy
352be4d0c0 added the have support section and reworded the donation section to be clearer 2011-09-19 15:29:19 -07:00
John Edmonds
cfd174bd2c Make header gradient work in Opera. 2011-09-17 13:01:51 -04:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Gonzalo Rodriguez
181bc6cd57 Dim a little bit separation bar. Closes #1936. [ci skip] 2011-09-13 23:38:37 -03:00
alda519
2d47658b08 removes underline in tag search form on getting started page 2011-09-13 08:14:20 +02:00
Gonzalo Rodriguez
2947ee46f4 Bold titles on profile information sidebar. Closes #1934. 2011-09-13 00:04:51 -03:00
Gonzalo Rodriguez
4f17dbf36e Reuse abortAjax function on aspectNavigation widget 2011-09-11 22:49:57 -03:00
Gonzalo Rodriguez
37c67c23cf Add aspectLis to aspectNavigation widget 2011-09-11 22:46:45 -03:00
behrooz shabani (everplays)
0370fab706 Merge branch 'css-rtl' of github.com:everplays/diaspora into css-rtl 2011-09-10 16:20:15 +04:30
Gonzalo Rodriguez
04786bc43e Improvements on aspect navigation rework 2011-09-08 02:13:15 -03:00
Gonzalo Rodriguez
6131d5d29d Merge branch 'master' into aspect_nav_rework 2011-09-08 01:54:49 -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
Maxwell Salzberg
a7602c4fd1 update jquery mobile 2011-09-05 10:51:36 -07: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
Dan Hansen & Gonzalo Rodriguez
2057c8fcf1 Aspect navigation rework started.. 
ToDo:
  * Fix failing posts cuke, seems to be timing issue
  * Populate stream title when no aspects selected
  * All aspects selected by default?
 2011-09-05 02:02:07 -03:00
danielgrippi
66836e53d2 Aspect dropdowns read 'All Aspects' if all aspects are selected 2011-09-03 18:38:12 -07:00
Maxwell Salzberg
fd68915461 MS DH fix tag show page comments 2011-09-03 14:47:52 -07:00
Maxwell Salzberg
13ba4eb3b2 update jquery expander, but disable use until we flution to working with <p> tags 2011-09-03 13:03:00 -07:00
Maxwell Salzberg
722a2a86ea remove console.log; instantiate a page for jasmine tests 2011-09-03 12:21:09 -07:00
Maxwell Salzberg
eb6263084e MS DH fix liking of posts and comment js; instansiate streamElement widgets when they are socketed 2011-09-03 12:09:34 -07:00
Daniel Grippi
c63dfb88fe Merge pull request #1883 from manuels/lightbox-click-cursor 
[PaperCut] Change cursor for lightbox thumbs
 2011-09-02 20:14:02 -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
vcuculo
b30a25713e fixed bookmarklet 2011-09-02 01:11:25 +02:00
vcuculo
6518a89302 fixed bookmarlet 2011-09-02 00:44:56 +02:00
Maxwell Salzberg
e6d1617268 added timeago to notifications page. @ohaibbq, this is getting annoying :P 2011-09-01 10:52:07 -07:00
Daniel Grippi
9cff210b24 Merge pull request #1691 from manuels/issue1596-Make-hashes-of-hashtags-in-text-shinier 
[PaperCut] add underlining for hovered tags
 2011-09-01 10:05:54 -07:00
maxwell
f5fbaaadcf added timeago and stream to the tag page 2011-08-31 21:54:14 -07:00
Dan Hansen
818af38bdf autoresize inputs 2011-08-31 17:13:24 -05:00
danielgrippi
7e72a29401 fixed aspect edit pane (removed diaspora ids) 2011-08-31 14:55:23 -07:00
Maxwell Salzberg
197dcc1a61 Merge pull request #1856 from vcuculo/fix-search-user 
Previous fix for avatars doesnt work on FF
 2011-08-31 09:29:52 -07:00
vcuculo
5b0ce6b2a9 fix for mobile site 2011-08-31 14:11:51 +02:00
vcuculo
3832f24a02 previous fix for avatars doesnt work on FF 2011-08-31 09:25:39 +02:00
Dan Hansen
cbc168fc27 only request comments once 2011-08-30 23:12:17 -05:00
Dan Hansen
3bed2ac834 only pass in the post's likes container to the likes widget, comments have likes widgets 2011-08-30 22:53:47 -05:00
Daniel Grippi
50e7d2a254 Merge pull request #1852 from vcuculo/fix-search-user 
fixed user search + avatar
 2011-08-30 20:44:55 -07:00
Dan Hansen
7e20cece42 remove stray console.logs, set $.fx.off to true to make the failing likes spec pass in firefox 2011-08-30 21:44:43 -05:00
Dan Hansen
f788de17fd allow the user to see who has liked a specific comment. 2011-08-30 21:13:12 -05:00
Dan Hansen
dc947e449b fix issues with comment stream, fix likes, merge comment stream and comment toggler widgets. 
make timeago widget a simple wrapper for $.fn.timeago (we don't really need this.)
 2011-08-30 21:07:40 -05:00
vcuculo
640408b166 fixed user search + avatar 2011-08-30 22:38:39 +02:00
Maxwell Salzberg
51ace97323 fix youtube embedding. camelCase is such a bummer 2011-08-30 11:55:51 -07:00
Manuel Schölling
2b6167f99d Change cursor for lightbox thumbs 2011-08-30 15:18:10 +02:00
Gonzalo Rodriguez
57c531ffdc Sorry, only for the user name link 2011-08-30 03:32:19 -03:00
Gonzalo Rodriguez
447b92a6fe Remove annoying dotted rectangle on user menu 2011-08-30 03:26:14 -03:00
Andrej Kacian
e1cfd59dce Move bindings for post hiding/deleting effect from old stream.js to StreamElement 2011-08-30 01:18:51 +02:00
Andrej Kacian
4d666e3f5b Fix back-to-top scroller widget. 2011-08-29 22:50:28 +02:00
Maxwell Salzberg
f479a9a144 Merge branch 'brianwisti-1305-full-markdown' 2011-08-29 10:56:48 -07:00
Andrej Kacian
e1838729fe Fix account name color in user menu, issue #1833. 2011-08-29 11:55:44 +02:00
Gonzalo Rodriguez
5dcff46d0b Fixing expand likes ajax call that was broken. Related jasmine still red. 2011-08-29 04:06:55 -03:00
danielgrippi
b7f9400a9f Moved post/comment text collapsing into respective widgets; removed from stream.js. Removed an unused function in stream.js (image hotlinking). 2011-08-28 22:04:06 -07:00
Gonzalo Rodriguez
a618b261f3 Closes #1571. Give min-width to user menu. 2011-08-28 23:02:28 -03:00
Andrej Kacian
f0b8114738 Show friendly timestamps when expanding all comments on a post. 2011-08-28 18:46:19 +02:00
danielgrippi
3a27d66ee8 fix hover to add hover class to element (ugly); fixes one cucumber test 2011-08-27 23:20:57 -07:00
danielgrippi
802dd989a8 remove javascript in lieu of css; feature is still failing 2011-08-27 22:04:30 -07:00
Sarah Mei
60c8a0d00b Use different mouse events to fix tag unfollow icon hovering 2011-08-27 21:54:05 -07:00
Maxwell Salzberg
c66b7d584d Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown 
Conflicts:
	Gemfile.lock
 2011-08-27 14:13:15 -07:00
Dan Hansen
20b4304f23 fix cucumber failures 2011-08-26 15:32:13 -05:00
Dan Hansen
27d4fd8176 fix retractions, fix likes, backfill likes widget tests, remove typo from jasmine.yml, remove unneeded js files 
require confirmation for comments in js, get rid of rails helper
 2011-08-26 15:24:07 -05:00
Andrej Kacian
2d45a4287f Fix tipsy tooltips in stream elements 2011-08-26 21:19:52 +02:00
Dan Hansen
07beb3c1fb add a basepage that is instantiated on all pages. remove meaningless pages 2011-08-26 12:30:28 -05:00
Dan Hansen
d75ef8d020 made backtotop a widget, added jquery-debounce 2011-08-26 12:30:28 -05:00
vcuculo
d90f38bb38 fix live stream 2011-08-26 18:54:30 +02:00
Maxwell Salzberg
8dfb278509 Merge pull request #1795 from lksnyder0/admin_nav 
Admin nav
 2011-08-25 16:35:09 -07:00
Maxwell Salzberg
b70f684efc fix css for hovercards in notifications, and people with long names 2011-08-25 12:16:03 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2708b0b695 added back the tooltip explaining username constatrains on the accept invite flow 2011-08-24 17:35:27 -07:00
Dan Hansen
121c0c97f8 optimize infinite scroll widget instantiation. don't instantiate timeago widgets for StreamElement and Comment widgets 2011-08-24 19:23:39 -05:00
Maxwell Salzberg & Sarah Mei
c1c622ff52 Viewing more comments rebinds javascript 2011-08-23 23:39:56 -07:00
Maxwell Salzberg & Sarah Mei
a7d05756db Infinite scroll now provokes stream refresh 2011-08-23 23:00:55 -07:00
Maxwell Salzberg
b7d6d511df pass in the class for signifing 'in aspects' 2011-08-23 13:58:05 -07:00
Maxwell Salzberg
2a5155fd4d IZ MS fixed facebook inviter for people you are already friends with to use the normal aspect membership dropdown, and created some nuiaces in the seed script between bob, alice and eve and their fb status" 2011-08-23 13:50:03 -07:00
Maxwell Salzberg
3366aa62dc add a bunch of boilerplate js pages so the header works. would be great to get a baseclass, or some sort of 'run this on all pages' kinda thang 2011-08-23 10:52:37 -07:00
Gonzalo Rodriguez
43d6acd868 Support green login page flash message for password change success 2011-08-23 00:51:00 -03:00
Dan Hansen
049efae1a6 instantiate StreamElement widget after a post has been added to the stream by a user. time to clean publisher.js up. gross. 2011-08-22 20:11:56 -05:00
Dan Hansen
6b040c7b4a clean up websocket receiver, add specs to content updater 2011-08-22 20:03:38 -05:00
Andrej Kacian
59ba3f85e6 Moved live() bindings for post hide icon from Stream.initialize to Stream.initializeLives 2011-08-22 20:18:02 +02:00
Dan Hansen
4a64a172d1 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	spec/javascripts/stream-spec.js
 2011-08-21 20:57:01 -05:00
Dan Hansen
545611fffa green? 2011-08-21 20:45:51 -05:00
Andrej Kacian
bd3683d0d1 Fix selector in the hide undo click handler. 2011-08-22 01:15:43 +02:00
Andrej Kacian
50f32ce5ac Show ajax loader and hide the hide icon when hiding a post. 2011-08-22 00:38:34 +02:00
Luke Snyder
f9fc55823b finished styling 2011-08-21 13:07:04 -04:00
Dan Hansen
3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged 
Conflicts:
	app/views/status_messages/bookmarklet.html.haml
	config/assets.yml
	db/schema.rb
	public/javascripts/contact-edit.js
	public/javascripts/publisher.js
	public/javascripts/view.js
 2011-08-20 14:40:56 -05:00
Maxwell Salzberg
735a37ffe0 really basic preventivie mesures for facebook friending. we need to GO ALL THE WAY and proxy facebook users to be in many aspects 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
bb5ada6533 create a wrapper class for devise mailer, both so we can resquify it and so we can inject helpers 2011-08-19 15:57:10 -07:00
Maxwell Salzberg
e4062bf5fd now functionally correct 2011-08-19 15:56:32 -07:00
Maxwell Salzberg
70fe2cf10f wip 2011-08-19 15:56:31 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2c47262d54 manually pulled in manuels latest commits 2011-08-18 16:49:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3bcb9c962 Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"" 
This reverts commit a407f12463.
 2011-08-18 16:48:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a407f12463 Revert "Merge branch 'issue1586-aspectdropdown-when-posting'" 
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
 2011-08-18 16:16:14 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2777f16f4f Merge branch 'issue1586-aspectdropdown-when-posting' 2011-08-18 16:02:09 -07:00
Maxwell Salzberg
947dfaacf7 make profile photo auto so it does not get smooshed 2011-08-18 14:09:50 -07:00
Andrej Kacian
e033eda5d1 Use live binding for tipsy tooltips within stream elements, so that elements loaded by the infiniscroll get them too 2011-08-18 22:28:36 +02:00
Andrej Kacian
f59275adb4 Actually add the comment delete link to list of tipsified elements 2011-08-18 22:22:47 +02:00
Andrej Kacian
f5e93c3e83 Comment delete icon should also have a tipsy tooltip 2011-08-18 22:12:09 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b1e95def4a Merge branch 'master' into issue1586-aspectdropdown-when-posting 2011-08-18 12:59:00 -07:00
danielgrippi
fca2be5c5d facebox overlay dark again, with a faint spotlight 2011-08-17 22:43:58 -07:00
Brian Wisti
03127cd592 basic support for Redcarpet Markdown 2011-08-16 21:48:48 -07:00
Raphael Sofaer
97ab077e04 Abort old aspectFilters requests, close issue 1759. 2011-08-16 15:31:02 -07:00
Raphael Sofaer
cc3eeac98e Merge the aspect dropdown in the publisher with master, some things are still broken 2011-08-16 14:59:53 -07:00
Luke Snyder
b62801bd64 Initial styling and links 2011-08-14 22:10:56 -04:00
Raphael Sofaer
a2f7fed8f4 Fix syntax error in WSR, move tipsy from views into stream.js, fix stream element delete tipsy. 2011-08-14 17:45:50 -07:00