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

2951 commits

Author SHA1 Message Date
danielgrippi
d5a4f9eb98 use content_view for comments (markdown, tagging) 2012-01-07 20:19:47 -08:00
danielgrippi
e928cc805a fixed markdown issues with reshares; removed puts from specs 2012-01-07 17:33:16 -08:00
danielgrippi
687eb7ba0b double check on photos 2012-01-07 15:48:40 -08:00
danielgrippi
d2807b5202 markdown for posts on front end, tags broken 2012-01-07 14:24:27 -08:00
danielgrippi
3db0cd3776 fix all cukes but the tags feature [ci skip] 2012-01-07 14:24:27 -08:00
danielgrippi
2024716c2c remove unusued javascript files; GC clearing from application/vanna controller 2012-01-07 14:24:27 -08:00
danielgrippi
3f7144f214 added hide post feature back to stream 2012-01-07 14:23:28 -08:00
danielgrippi
ae5fb67f71 long text truncation 2012-01-07 14:23:28 -08:00
danielgrippi
f72edbc039 added notification and unread mesasge count back to the header 2012-01-07 14:23:28 -08:00
danielgrippi
933299e31c added translations to templates; mock out the locale file in jasmine 2012-01-07 14:23:28 -08:00
Dennis Collinson
d5e9c5eebc DG DC add stream faces to page party 2012-01-07 14:23:28 -08:00
Dennis Collinson
7ccc81b0a4 fix conversations cuke 2012-01-07 14:23:28 -08:00
Dennis Collinson
b582f45452 green jasmine, yo 2012-01-07 14:23:28 -08:00
danielgrippi
5e28c8f6ec fix backing out of photo-only post cuke 2012-01-07 14:23:27 -08:00
danielgrippi
dbfb18e249 display reshare counts; test inf scroll & reshare counter in jasmine instead of cucumber 2012-01-07 14:23: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
31fac53969 added blocks js model; load app.models.Post before any other model when loading assets 2012-01-07 14:23:27 -08:00
danielgrippi
85b5974fa9 removed top-level element delcarations from app templates 2012-01-07 14:23:27 -08:00
danielgrippi
64a90a30ef only load photos for a post if photos_count > 0; display 'limited' or 'public' in stream elements; fix small like bug in stream 2012-01-07 14:23:27 -08:00
danielgrippi
f804db36b8 DG DH; fix most of the cukes (7 failures left) 2012-01-07 14:23:26 -08:00
danielgrippi
1804b19ccc DG DH; dry-d up appending/prepending posts to the stream's collection 2012-01-07 14:23:26 -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
42276a73c8 remove old stream initialization from js pages; remove websocket js code 
from the layout; rename templates to have a .jst extension
(JavaScriptTemplate?)
 2012-01-07 14:23:26 -08:00
danielgrippi
3268726a9a added LikesInfo view; simplified Feedback view (not sure how to mock the jasmine specs correctly... ugh) 2012-01-07 14:23:26 -08:00
danielgrippi
4fabbe93a5 fix ResharesController / StatusMessage controller spec; remove another js response 2012-01-07 14:23:26 -08:00
danielgrippi
719e265b68 modified app to return a hash if current_user is not present; removed view specs in postsController specs & moved logic to js/jasmine 2012-01-07 14:23:26 -08:00
danielgrippi
0a4b4fb344 remove duplication in jasmine tests (Post view / Feedback view); one correclty failing jasmine spec for Feedback view; created a StatusMessage model for the publisher 2012-01-07 14:23:26 -08:00
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
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
fe4530f86b fixed 500 on notifications#index 2012-01-07 14:23:25 -08:00
danielgrippi
52183b8cc4 fix name in header; 27 failures 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
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
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
841cc29d25 add api block to photo; photos display in stream 2012-01-07 14:23:23 -08:00
danielgrippi
6911ed5d7d expand comments working 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
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
cec2d27204 ported likes logic for the stream over from old branch 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
414fb8d454 corrected template views; status message now includes oembed; updated post.rb api to supply oembed and object_url 2012-01-07 14:23:21 -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
4883c70ae2 move templates into app/views/templates/_templates.haml 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
1ecfa92c9e DH DG; create comments via backbone 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
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
aa7343d759 add profile streams to backbone. this breaks hovercards, atm. 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
91ba6447d0 add acts_as_api to the models directly for now. the 'root node' problem (posts : {}) breaks backbone. wip 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
91c21f5d92 MS SM; removed seemingly unused(?) layout file 2012-01-07 12:56:32 -08:00
Maxwell Salzberg
2422bdab46 MS SM; make loading jquery from cdn or local a helper so we can stub it in cukes 2012-01-07 12:55:46 -08:00
Maxwell Salzberg
523a960d94 peace troll 2012-01-05 18:53:27 -08:00
Maxwell Salzberg
d9c2b0d4b5 make cdn jquery http/s agnostic 2012-01-04 23:57:28 -08:00
Maxwell Salzberg
fdea2f94ff remove icky analytics code from layouts, move to middleware 2012-01-04 23:54:48 -08:00
Maxwell Salzberg
7cc6e3ed68 uncomment cdn line.. whoops 2012-01-04 22:19:37 -08:00
Jonne Haß
52c75a7ad4 Revert "Revert "auto follow back feature"" 
This reverts commit 6408105917.

Conflicts:

	db/schema.rb
 2012-01-04 13:49:56 +01:00
Maxwell Salzberg
34e4c027d0 small typo 2012-01-03 22:47:10 -08:00
Maxwell Salzberg
4e574c3fef fixed loading jquery from the CDN, and the fallback to the local copy still works 2012-01-03 20:02:52 -08:00
Maxwell Salzberg
63cdd93afc the websocket has been completely removed, and replaced for a stub until 
we find a better way to reimpliment it in a  more sane way
 2012-01-03 18:39:54 -08:00
danielgrippi
6ab03d33b4 hotfix for an error that would cause a 500. (this is a temp fix for fixing the photo cache counter on deletions) 2011-12-30 23:51:13 -05:00
Steven Fuchs
a7af886da2 add 'read' class ro read messages to match the 'unread' class associated with unread messages. This will keep us from attaching jquery functionality to notification types we may not know about. 2011-12-22 15:53:14 -05:00
danielgrippi
0f42c98a7b merge Pistos's reshare branch into master 2011-12-20 14:42:18 -08:00
Pistos
f83e56e5f3 Added a counter cache for the number of reshares of a post. 2011-12-19 17:12:17 -05:00
Pistos
e951fa6a9c Use Post#reshare_count in the view so that we take advantage of the memoization instead of hitting the DB more than necessary. 2011-12-19 17:12:17 -05:00
Pistos
e9c87f7f44 Always show "Reshare original" for link. Show number of reshares in the post_initial_info div. 
This is to improve UX by making it much more obvious how to reshare a post that
has already been reshared.  Prior to this change, the link to reshare would show
only the reshare count, e.g. "7 reshares".  Most users would have no idea that
they need to click "7 reshares" to reshare the post themselves.
 2011-12-19 17:12:17 -05:00
Lennart Prelle
20a39714bf added translation for close account 2011-12-15 15:35:30 +01:00
Jonne Hass
05be43e21a fix #2504 2011-12-10 12:44:55 +01: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
c0ac664d64 translated close account 2011-12-08 16:32:20 -08:00
danielgrippi
342593988b MS DG; fixed close account cukes 2011-12-08 16:32:20 -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
Maxwell Salzberg
2282fd35d1 kill no longer used youtube titles code with fire 2011-12-08 16:16:57 -08:00
Jonne Hass
a892ea41eb refactor out profile url generation into local_or_remote_person_path and use it everywhere. closes #2471 2011-12-06 13:08:21 +01:00
tmlee
3b6c6c564f Include "Looking For #link" under params[:q] blank else branch 2011-12-03 21:23:39 -02:00
Daniel Grippi
71354a1673 Merge pull request #2469 from geckoxx/comment_stream_new 
better commented_posts_stream
 2011-12-02 10:42:36 -08:00
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Kaleem Ullah
afa1274d7c change upload photo alt text 2011-12-01 10:22:35 +04: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
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
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
Daniel Grippi
8a27568273 Merge pull request #2428 from geckoxx/comment_stream 
comment_stream
 2011-11-28 09:05:45 -08:00
Vittorio Cuculo
fdd52782d2 show diaspora_handle on profile [mobile] 2011-11-24 09:42:15 +01:00
Jonne Hass
a40fbc9617 Merge pull request #2403 from gandaro/outdated-information-cubbies 
deleted tokens:show:login_with_diaspora_is_comming
 2011-11-23 13:07:10 -08:00
Michael Sofaer
2b8d07f94b Censorship point has been made ... for now. 2011-11-22 15:54:50 -08:00
Johannes Hackel
7368bb9e62 comment_stream 2011-11-20 18:37:10 +01:00
Dan Hansen & Sarah Mei
7e4028626f Fix lightbox for non-logged-in user 2011-11-19 21:45:31 -08:00
Jake Peryl
07f05ebead Issue #2284: simple fix 2011-11-17 01:22:01 +01:00
danielgrippi
cc4531f73c stop censorship. sopa 2011-11-16 16:04:21 -08:00
Jonne Hass
565ef69441 translate Email in the sidebar 2011-11-16 21:55:09 +01: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
Jakob Kramer
3f3dbf0c6c deleted tokens:show:login_with_diaspora_is_comming, because it got outdated by now 2011-11-15 14:42:47 +01:00
danielgrippi
8e55fc158b use root_path in header if not logged in 2011-11-14 19:04:27 -08:00
danielgrippi
6be778b9b2 change root_path and root_url to multi_path 2011-11-14 18:01:09 -08:00
danielgrippi
6408105917 Revert "auto follow back feature" 
This reverts commit 226554becf.

Conflicts:

	config/locales/diaspora/en.yml
 2011-11-14 17:18:43 -08:00
Sarah Mei & Tim Frazer
e38cb41f85 Better error messages for folks coming in with a bad invitation token, whether by clicking the "view this invitation in your browser" link or by clicking the accept invitation button. 
Get rid of 500 error on the "view this invitation in your browser" link
 2011-11-14 17:02:13 -08:00
Michael Sofaer & Sarah Mei
3e1d06ded3 Memorial splash page 2011-11-14 14:16:09 -08:00
Jonne Hass
226554becf auto follow back feature 2011-11-14 20:25:11 +01:00
Jonne Hass
9839ac559c fixed timeago for posts#show if not logged in 2011-11-11 23:06:08 +01:00
Jonne Hass
65f8136690 made public translatable in the publisher dropdown 2011-11-11 23:00:46 +01:00
Pistos
ef075b7b15 Don't render "getting started" help text over aspect dropdown if the user isn't actually getting started. 
This fixes a UI bug which showed remnants of the "getting started" text on hover.
 2011-11-10 20:41:09 -05:00
Pistos
d3d92e5957 Only render "getting started" help text for users that really are getting started. 
This fixes a UI bug which showed remnants of the "getting started" frontend code on hover.
 2011-11-10 20:04:26 -05:00
Pistos
ef990e04cd Refactor new user helper text in publisher; improved code readability. 2011-11-10 20:03:52 -05:00
Lennart Prelle
d95b28a9be added translation to tag_path in _right_selection 2011-11-10 15:14:07 +01:00
Daniel Grippi
6c68fd752f Merge pull request #2362 from Pistos/remove-invalid-comment-in-publisher 
Remove a comment from the publisher Haml code, so publisher isn't mangled
 2011-11-09 16:33:37 -08:00
Daniel Grippi
eb6fc5f130 Merge pull request #2367 from lprelle/newhere_to_locale_translation 
#NewHere to locale translation
 2011-11-09 16:09:12 -08:00
Jason Robinson
af5c469f10 Created missing view for mobile bookmarklet. Adjusted status_messages_controller.rb to render it. 2011-11-09 22:44:57 +02:00
Lennart Prelle
f2997f5146 change #newhere to translation 2011-11-09 20:38:06 +01:00
Pistos
e0a9b50c84 Remove a comment from the publisher Haml code, so publisher isn't mangled in Firefox 3. "//" is not really proper Haml comment syntax anyway. 2011-11-09 12:50:10 -05:00
Maxwell Salzberg
8cab4cb2e2 open up tag show publisher, have a cuter message on the page 2011-11-08 12:34:06 -08:00
Jonne Hass
730d2d9754 add missing .html_safe 2011-11-08 21:32:15 +01:00
Maxwell Salzberg
5c2b59da22 add a link to the tag show page from the search page 2011-11-08 11:47:17 -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
Jonne Hass
78e03056e8 little reorder in application.yml.example and only show donations in sidebar if paypal stuff is set 2011-11-06 23:03:20 +01:00
Jonne Hass
9a556f7cb2 Merge pull request #2338 from buddhamagnet/2307-private-inbox-bug 
2307 private inbox bug
 2011-11-06 13:12:03 -08:00
buddhamagnet
d8a22da275 amended view to pass in time to translated string for private inbox thread time display 2011-11-06 18:47:51 +00:00
buddhamagnet
77474b214a added translateable text to inbox thread times 2011-11-06 18:08:51 +00:00
Jonne Hass
50baa4ba92 also link to the translated tag 2011-11-06 18:06:26 +01:00
Jonne Hass
a1eee6e90f made help tags translatable so that local communities can take care of the new users, also fixed #2327 2011-11-06 16:43:13 +01:00
Jakob Kramer
b8dbf1d81e fixed 500 error if one is opening people's photos view and there are no images in the user's stream 2011-11-06 13:29:57 +01:00
danielgrippi
9a2ee973a3 make service icons larger 2011-11-05 18:13:31 -07:00
Dan Hansen & Maxwell Salzberg
2a4abc5483 show service icons on mobile site 2011-11-05 13:23:29 -05:00
Jonne Hass
9ee3b2d080 improved closing account experience and fixed the cuke 2011-11-05 11:30:21 +01:00
danielgrippi
39b6abaa88 do includes before last(3), as last() returns an array, not an AR object 2011-11-04 16:46:30 -07:00
danielgrippi
3296477531 eager load author and profile for comments 2011-11-04 16:40:14 -07:00
Ilya Zhitomirskiy
f3183a11e1 message explaining that we're populating things in the background 2011-11-04 16:20:51 -07:00
Ilya Zhitomirskiy
ecd2a52553 added a password field before account closure 2011-11-04 10:25:19 -07: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
0ab23f337a fixed all cukes; view bugs on streams 2011-11-03 12:31:24 -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 & Maxwell Salzberg
5b8365118d Stream#posts no longer needs to call for_a_stream 
exclude blocked users from all streams
 2011-11-03 12:31:24 -07:00
Dan Hansen
16e76886d9 wip 2011-11-03 12:31:24 -07:00
Maxwell Salzberg
6df5904e13 stop the catastrophic from happening" 2011-11-02 11:59:55 -07:00
Ilya Zhitomirskiy
640733e3d3 fixed the photo index for person 2011-11-02 10:47:50 -07:00
Dan Hansen & Maxwell Salzberg
697ad1e84f add new here to right section 2011-11-01 17:19:05 -05:00
Dan Hansen
066f8d1235 Mention the person who invited a user on first message 2011-10-31 22:16:58 -05:00
Lennart Prelle
f2123d942d make language for email-invitation available 2011-10-31 21:11:47 +01:00
Ilya Zhitomirskiy
82fabbadd1 Revert "remove sort order option from the stream (commented at is too crazy and way to slow on large data sets)" 
This reverts commit 95aac2f352.
 2011-10-31 12:38:00 -07:00
danielgrippi
95aac2f352 remove sort order option from the stream (commented at is too crazy and way to slow on large data sets) 2011-10-30 21:46:23 -07:00
Pistos
d643f7e893 Make the donation form (right sidebar) optional. Show or hide via application.yml . 2011-10-29 00:42:09 -04:00
Zach Prezkuta
2f69737014 re-enable photo viewing on mobile 2011-10-28 17:10:20 -06: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
Dan Hansen
29a0706123 hide duplicate flash notice on Sessions#new 2011-10-27 20:31:14 -05:00
danielgrippi
c8fc9fcb76 fixed spinny location on getting_started 2011-10-27 18:03:09 -07:00
danielgrippi
0b18e47b82 connect_to_comment text for federated users 2011-10-27 17:24:25 -07:00
danielgrippi
07a4fb8e96 download photo unavailable prompt 2011-10-27 17:22:33 -07:00
danielgrippi
b879070744 avatars for likes 2011-10-26 23:50:01 -07:00
Maxwell Salzberg
94ebc8b37a update title 2011-10-26 17:40:24 -07:00
danielgrippi
96f74cf930 added feedback to all getting_started states. postive feedback, ftw. 2011-10-26 17:34:15 -07:00
Maxwell Salzberg
9789e25c99 fix oembed spec; prevent people from commenting on posts that wont federate 2011-10-26 17:32:27 -07:00
danielgrippi
dd00523616 show flash messages when adding a person to an aspect 2011-10-26 16:36:47 -07:00
Pistos
29573586c8 Merge branch 'master' into issue-2032-view-comments-on-public-post-without-login 2011-10-25 23:02:42 -04:00
Maxwell Salzberg
1a521a792a zomg text collapse is finally back #thankgod 2011-10-25 19:46:09 -07:00
Pistos
3ce0806cbc Merge branch 'master' into issue-2032-view-comments-on-public-post-without-login 
Conflicts:
	app/controllers/comments_controller.rb
	app/helpers/comments_helper.rb
 2011-10-25 22:21:08 -04:00
danielgrippi
f204910aa4 add 'mark all as read' on notification dropdown 2011-10-25 17:33:57 -07:00
danielgrippi
9fba69cd5b added person stream; temp hack for photos 2011-10-25 16:29:45 -07:00
danielgrippi
0512ade65a made name smaller and clickable on aspects/index [ci skip] 2011-10-24 21:43:32 -07:00
danielgrippi
03d3e885b5 disapora logo goes to stream page on mobile 2011-10-24 21:20:31 -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
5d54fc6c28 removed community spotlight stream link from right side 2011-10-24 20:14:28 -07:00
danielgrippi
02199b172b remove duplicate wording 2011-10-24 18:51:34 -07:00
danielgrippi
0033237b4e made flash messages awesome this time 2011-10-24 17:33:18 -07:00
Maxwell Salzberg
d5e3033308 make a setting to check out the new getting started 2011-10-24 17:10:36 -07:00
danielgrippi
0874a632f4 make gs dismissal icon translucent 2011-10-24 16:11:26 -07:00
danielgrippi
90d9852e08 updated welcoming text re: peter's suggestions 2011-10-24 16:06:56 -07:00
Ilya Zhitomirskiy
c447415d9f allowing users to dismiss new user toolips 2011-10-24 15:57:25 -07:00
Ilya Zhitomirskiy
62e12f248c fixed missing translation on the signup and invitation accept pages 2011-10-24 15:07:29 -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
431fa3fd04 removing getting started on first post and having tooltips in the 
publisher
 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
1ccf965194 publisher lib, prefill, open, still need to do public first message for new users 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
bfd2d440d1 ajax form on the getting started 2011-10-24 14:11:34 -07:00
Ilya Zhitomirskiy
c7838debcf creating multiple tag_followings 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
Dennis Schubert
2fcc783787 Add mobile registration site to fix ugly 500 2011-10-24 22:50:25 +02:00
Maxwell Salzberg
4022ff5163 small possible fix for conversations 2011-10-24 13:06:32 -07:00
Maxwell Salzberg
aa2fd8abcf make stream link to home icon 2011-10-24 11:34:17 -07:00
Gonzalo Rodriguez
63f0dac922 Don't allow to reshare someone else's rehare of your post. Fixes #2214. 2011-10-23 05:06:09 -02:00
Gonzalo Rodriguez
4331e74673 Associate lables to checkboxes 2011-10-23 02:22:40 -02:00
Gonzalo Rodriguez
0a081b051c Fix more 'communtiy' typos 2011-10-23 01:39:23 -02: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
Maxwell Salzberg
484f46d70f add validation which prevent user for signing up with dead username. fix cucumber features 2011-10-20 16:32:09 -07:00
danielgrippi
34816f3a7f add ability to email suggestions for community spotlight members 2011-10-20 12:08:05 -07:00
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
Maxwell Salzberg
6cce4f0872 small typo on invites#edit 2011-10-20 11:27:21 -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
danielgrippi
4896d056c7 move public option into aspect dropdown in publisher 2011-10-17 15:04:35 -07:00
Sarah Mei
c2c152ee4b Change tag serializer to use tagged_people_count instead of people_count. Fixed typo (was tagge_people_count) 2011-10-16 15:55:22 -07:00
Manuel Schölling
02a3c3f88b Introduced Shareable 2011-10-16 13:58:35 +02:00
Manuel Schölling
6e325f8fd5 Introduced Commentable 2011-10-16 13:58:35 +02:00
Maxwell Salzberg
3179ebabc9 fix tag stream 2011-10-15 22:37:53 -07:00
Maxwell Salzberg
ea700716ab SM MS remove instance var from mobile post view 2011-10-15 21:18:58 -07:00
Maxwell Salzberg
ea0240d6f8 fix broken mobile tag view 2011-10-15 21:08:22 -07:00
Maxwell Salzberg
d6e9809be1 MS SM finished tag stream refactor 2011-10-15 20:40:20 -07:00
Maxwell Salzberg
2dda160990 tag stream wip 2011-10-15 18:57:35 -07:00
Pistos
fae9aee425 Fix specs. 2011-10-15 14:47:09 -04:00
Jonne Hass
517e37b56a fix another missing translation and a cucumber feature 2011-10-15 12:59:50 +02:00
Jonne Hass
6606bd01b1 fix missing translation 2011-10-15 12:28:18 +02:00
Pistos
35a0c56346 This fixes issue #2032. Anyone can now view all comments on a public post without needing to log in. 2011-10-15 00:18:17 -04:00
danielgrippi
9013903b14 featured users -> community spotlight 2011-10-13 23:33:57 -07:00
Daniel Grippi
b7f4f81d28 Merge pull request #2148 from Pistos/issue-2007-comment-order-on-postgresql 
Explicitly specify order of comments, since we cannot assume MySQL orderi
 2011-10-12 16:09:18 -07:00
Gonzalo Rodriguez
f655b12e98 Refactor display setup for De/select_all aspects link 2011-10-12 00:06:25 -02:00
Maxwell Salzberg
cfb28db00f wip, but the refactored code works 2011-10-11 16:12:32 -07:00
Manuel Schölling
f3ea8f424f Added oEmbed support 2011-10-11 16:08:47 -07:00
Pistos
15b3cce6ee Refactored ordering of post comments; moved it down to model level for greater reach (DRYer code). 
Leaving the #order call in #last_three_comments caused the generated SQL to
have two conflicting ORDER BY components, which caused the query to return
invalid results.  I removed the problem by removing #last_three_comments which
I consider a premature optimization.
 2011-10-11 16:06:24 -04:00
Ilya Zhitomirskiy
7fb26c4390 dg iz limiting to one month, added contacts sharing with count 2011-10-11 10:57:26 -07:00
Ilya Zhitomirskiy
288d20b6e8 correlations on the admins page 2011-10-11 10:57:26 -07:00
Ilya Zhitomirskiy
4c9b45b9c8 WIP 2011-10-11 10:57:26 -07:00
Daniel Grippi
eb19bc9a78 Merge pull request #2111 from vcuculo/fix-mobile-select 
Fix #2091 - Aspects selection on mobile
 2011-10-11 09:29:45 -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
Dan Hansen
814eb7b426 RFC2822 specifies that you use parentheses to denote a mailbox list. Use the addr-name spec to specify a display name and the from address. 
Check against the raw headers of the mail as @mail.from excludes the display name
Extract shared logic between notifier methods
 2011-10-09 22:19:50 -05:00
Pistos
cd3e824bc1 Explicitly specify order of comments, since we cannot assume MySQL ordering (which is by id). 2011-10-08 22:59:44 -04:00
Gonzalo Rodriguez
583dd20249 Refactor selected aspects ui setup 2011-10-08 23:14:04 -02: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
Maxwell Salzberg
1bf51f678c move featured users sidebar down 2011-10-07 11:17:18 -07:00
Your Name
bdc7c85b7e make tags links on featured users 2011-10-06 17:30:21 -07: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
Maxwell Salzberg
cdce54bbda MS SM featured users stream. because we do what we want 2011-10-05 21:12:02 -07:00
Gonzalo Rodriguez
04b51cced8 Merge branch '1584-aspects-list' 2011-10-06 01:52:53 -02:00
Gonzalo Rodriguez
4563632afe Avoid checkmark on 'All contacts' link 2011-10-06 01:07:28 -02:00
Gonzalo Rodriguez
30a13674e8 Edit aspect pencil was messed up with the title on the home page 2011-10-05 22:44:57 -02:00
Ilya Zhitomirskiy
3e2b30ec61 passing the server time to help intiate the infinite scrolling 2011-10-05 15:12:30 -07:00
Maxwell Salzberg
513b2cb5bc make the aspect edit page a little more helpful for empty state. a loonngggg way to go 2011-10-05 15:07:35 -07:00
Vittorio Cuculo
c47579cfd8 Fix #2091 - Mobile select aspect 2011-10-05 09:30:45 +02:00
Dan Hansen
8c15ca2a4b PMs and comments contain author name in "From" header 
refactor notifier
 2011-10-04 23:48:28 -05:00
Maxwell Salzberg
a3eeb9f3c1 comment on tagged posts wip 2011-10-04 18:20:15 -07:00
maxwell
eef054dc5e wip 2011-10-04 18:20:14 -07:00
Maxwell Salzberg
fca0ee7c7b make remember me hidden on mobile 2011-10-04 15:43:38 -07:00
Gonzalo Rodriguez
80a494f9ba Use haml instead of content_tag 2011-10-04 00:22:33 -02:00
danielgrippi
543bf458a2 extracted methods to helpers 2011-10-03 18:53:25 -07:00
Gonzalo Rodriguez
97e1775938 Adding alt text for header icons. Related to #2089. 2011-10-03 23:33:32 -02:00
Maxwell Salzberg
81e04a11fe fix tag stream, no comments for now, but coming soon 2011-10-03 17:30:22 -07:00
danielgrippi
1d818fdc23 added reshare to mobile site 2011-10-03 17:02:23 -07:00
Maxwell Salzberg
56f5efc373 yeah that didnt work 2011-10-03 16:14:27 -07:00
Maxwell Salzberg
ad9dcd8542 holy guacamole. mentions page and tag following pages, plus a huge stream refactor 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
412fe1b027 rebased and consolidated logic" 2011-10-03 15:22:14 -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
Maxwell Salzberg
b5c3f2c615 wip 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
0f073387ac IZ MS refactor commenting disabled 2011-10-03 15:20:43 -07:00
Lennart Prelle
0c42903d2c delete dash in comments 2011-10-03 23:42:30 +02:00
Gonzalo Rodriguez
ae1fedc73b Preserve search term on search input. Related to #1983. 2011-10-02 23:02:48 -02:00
Gonzalo Rodriguez
0b97a3525a Merge branch 'aspect_nav_rework' 2011-10-02 21:08:12 -02:00
danielgrippi
f9d88e122f limit contacts to 15 on aspects pages for faster network times 2011-10-02 13:11:30 -07: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
Maxwell Salzberg
647bc585cc always remember me on the mobile. make previous helpers shorter 2011-10-02 09:30:05 -07:00
Maxwell Salzberg
7c9eb065ba make some shared devise logic into a helper 2011-10-02 09:15:02 -07:00
danielgrippi
b881d7b3de default sort order to created_at instead of commented_on on desktop site 2011-10-01 16:24:28 -07:00
Dan Hansen
d0fe59af69 add cucumber feature for photo lightbox 
change step to reflect element visibility
 2011-10-01 15:52:48 -05:00
Maxwell Salzberg
00873cdc6a small fix for mobile tag show pages 2011-10-01 09:47:57 -07:00
Gonzalo Rodriguez
d3a5bc1fb8 Merge branch 'master' into aspect_nav_rework 2011-10-01 03:58:50 -03:00
danielgrippi
eaa191515e remove logging statement in a before filter that performed a query 2011-09-30 21:11:00 -07:00
Maxwell Salzberg
63c7634f6a Revert "header data as helper methods" 
This reverts commit 607013bc83.
 2011-09-30 14:43:52 -07:00
danielgrippi
607013bc83 header data as helper methods 2011-09-30 13:22:12 -07:00
Ilya Zhitomirskiy
27dcdf9a11 added an index to root_id 2011-09-30 11:35:07 -07:00