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

674 commits

Author SHA1 Message Date
danielgrippi
1c4a689af7 DG MS; added a new layout for post pages. 2012-02-21 15:23:27 -08:00
Maxwell Salzberg
42bed7ae1f Merge pull request #2868 from gandaro/2677-sanitize-bio 
fix server-side markdownify to sanitize links
 2012-02-18 16:23:33 -08:00
Maxwell Salzberg
063912287c use the user presenter, luke 2012-02-16 13:19:14 -08:00
danielgrippi
62c0ad13b7 DG MS; move logic out of layout into LayoutsHelper. 2012-02-15 18:38:36 -08:00
danielgrippi
f3f2b8ca44 change routes to properly reflect page names (activity/stream). 2012-02-14 11:16:41 -08:00
Jakob Kramer
dfe30e1fe0 fix server-side markdownify to sanitize links 2012-02-11 22:23:06 +01:00
danielgrippi
ed3d5c429a fix a bunch of small css related media box issues [ci skip] 2012-02-10 15:18:27 -08:00
danielgrippi
84eb313e20 updated routes to reflect page titles (explore/participate) 2012-02-08 14:40:28 -08:00
Sarah Mei
e4fa8d8466 Fix tags_helper, add specs 2012-01-29 11:46:51 -08:00
Maxwell Salzberg
13d1e68540 refactor people#index 2012-01-28 23:48:37 -08:00
Sarah Mei
d40746bff7 Fixes #2713 - searching for punctuation now doesn't throw a 500. Refactored people#index specs. 2012-01-28 13:45:39 -08:00
Maxwell Salzberg
939383ef32 You can now use rake assets:precompile to upload all of your static assets to s3. This uses your prexisiting settings in AppConfig for s3. then, start your server with ASSET_HOST={cdn_hostname} remember to include https and no trailing slash 2012-01-25 11:22:45 -08:00
Jonne Haß
7aaaf4f43b use guid instead of id for /people/ urls 2012-01-23 23:35:31 +01:00
Steven Fuchs
052690941b move set_header_data back into application_controller 2012-01-22 23:23:21 -05:00
Steven Fuchs
e882dedd33 remove vanna controller from app, adjust scripts, specs, views and controllers to work. 2012-01-22 17:39:35 -05:00
Maxwell Salzberg
642d20cecd update cdn jquery, fix #2699 2012-01-19 15:48:17 -08:00
danielgrippi
a658552c3f fix stream helper for mobile 2012-01-17 19:21:36 -08:00
Maxwell Salzberg
b09e76a0ce introduce base_pod_uri, so we can support domains that use www and [bare] with webfinger 2012-01-17 17:34:42 -08:00
danielgrippi
bfe0b7129c move all stream actions into PostController 2012-01-17 15:53:06 -08:00
Jonne Haß
a482d90bf0 do the extra include of language helper for the vanna controller… 2012-01-14 21:59:49 +01:00
Jonne Haß
c5654a43db do proper pluralization for JS 2012-01-14 20:27:17 +01:00
Maxwell Salzberg
0b6c5421c3 use deep merge. since we now have nested js, we need to do the merge recursively; fixes #2660 2012-01-14 02:49:34 -08:00
danielgrippi
efe55f395d remove ajax_stream? logic from streams now that we're using backbone & never ajaxing on mobile; remove unreferenced community_spotlight stream & controller 2012-01-13 13:50:52 -08:00
Jonne Haß
26aff017df do not call pphotos on a non StatusMessage in the page title helper either 2012-01-13 22:46:31 +01:00
Jonne Haß
e1edef9ff1 lets see how all this markdown in the title looks. Attempt to fix #2395 2012-01-13 22:09:22 +01:00
Ricky Elrod
5626948b3f Fix #2598 by having jQuery force the browser to not cache JSON responses. 2012-01-11 13:10:10 -05:00
danielgrippi
bee8aa8bcd remove unused files/methods 2012-01-11 02:26:12 -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
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
cf2c12d98b converting to string makes this not an htmlsafe buffer 2012-01-04 12:03:15 -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
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
176a33880f fix all specs minus one from o_embed_data_spec 2011-12-31 14:19:54 -05:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
danielgrippi
0f42c98a7b merge Pistos's reshare branch into master 2011-12-20 14:42:18 -08:00
Pistos
99f2d4f018 Original (root) posts should simply have "Reshare" as the English link text (not "Reshare original"). 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
Vittorio Cuculo
0e77fcb084 Fix #2488 soundcloud embedding 2011-12-19 09:50:39 +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
Ilya Zhitomirskiy
03ca34767a ms iz rendering nothing for hcard and webfinger if account is closed, not showing aspect dropdown if the user account is closed 2011-12-08 16:32:18 -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
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
Johannes Hackel
23fa7a0a3e like stream new 2011-11-29 17:27:09 +01:00
Johannes Hackel
7368bb9e62 comment_stream 2011-11-20 18:37:10 +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
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
Jonne Hass
226554becf auto follow back feature 2011-11-14 20:25:11 +01:00
Jonne Hass
59b99fe917 pluralization for show more comments, fix #2350 2011-11-09 11:07:35 +01:00