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

319 commits

Author SHA1 Message Date
flaburgan
ac533f8383 Refactor the left bar side menu, improve tag autosuggestion design, close #4271 2013-08-06 18:30:24 +02:00
Jonne Haß
9ec9ae0c6c Merge pull request #4349 from arlogn/webkit-cursor-pointer-on-input-file-button 
Cursor pointer on upload-photos button in webkit browsers
 2013-08-05 20:35:13 +02:00
Jonne Haß
6689f20710 Merge pull request #4321 from andrewcsmith/feature/4100-add-support-for-posting-to-wordpress-as-a-service 
Feature/4100 add support for posting to wordpress as a service

Conflicts:
	Gemfile.lock
 2013-08-04 17:15:39 +02:00
Andrew Smith
2bb6bc8eef Added Wordpress service functionality, 
for cross-posting to OAuth-enabled Wordpress.com or Jetpack-enabled Wordpress.org blogs.

Added model for Wordpress service

Added very very basic Wordpress cross-posting functionality.

Added markdown support to post body

Fixed Wordpress::MAX_CHARACTERS problem

cleanup

Added default settings for Wordpress OAuth

Added default settings for Wordpress OAuth

Added Wordpress to configured services spec.

changelog changes
 2013-08-04 07:46:56 -07:00
Fábián Tamás László
ba3d60b00f Only parse opengraph if oembed is not available 2013-08-04 15:55:09 +02:00
Jonne Haß
9d6ac1abe5 Merge pull request #4331 from meitar/tumblr-delete-deleted 
Tumblr posts should be deleted when users delete their originating Diaspora post.
 2013-08-03 14:41:57 +02:00
Jonne Haß
c7eed23c61 Merge pull request #4223 from svbergerem/3229-change-src-on-closing-lightbox 
Change image to ajax-loader when closing lightbox
 2013-08-02 06:26:49 -07:00
Steffen van Bergerem
f810e39f52 Change image to ajax-loader when closing lightbox 2013-08-02 14:46:15 +02:00
Jonne Haß
2e9de37594 add changelog entry for strong parameters [ci skip] 2013-08-02 11:51:43 +02:00
Plurrtard
6900146852 fix #4163 - Now updating correct contact attribute on retraction 
Added test case for Issue #4163
 2013-07-31 15:20:57 +02:00
Jonne Haß
7729b1e8e0 Merge branch 'Team-D-feature/4144-convert_ActivityStreamSPhoto_to_StatusMessages' into develop 2013-07-31 15:18:28 +02:00
Jonne Haß
4710144b02 Merge pull request #4293 from Team-D/feature/4274-error_message_vanishes_too_fast 
fixes issue 4274 flash-messages stay longer
 2013-07-31 15:12:44 +02:00
Jonne Haß
7ea2888c6d Merge branch 'tsrivishnu-publisher_autoclose' into develop 2013-07-31 15:09:23 +02:00
Jonne Haß
77c94bf4c2 Merge branch 'ZBarg-feature/improve-post-title' into develop 2013-07-31 15:01:44 +02:00
Jonne Haß
d5fbeff03b Merge branch 'Ruxton-develop' into develop 2013-07-31 14:27:08 +02:00
Jonne Haß
cdc29e449d Move facebox configuration into the initialization of the Backbone app 
Facebox is already called from some Backbone views very early, making its icons 404 otherwise.
 2013-07-29 12:20:05 +02:00
Jonne Haß
3627f46b2d Merge pull request #4309 from jflemingprod/feature/4068-logout-delete-request 
Log out should be a DELETE request
 2013-07-17 21:56:15 +02:00
Jonne Haß
4d196c5453 Merge pull request #4289 from rivendale2010/patch-2 
fix link to background image
 2013-07-09 19:23:06 +02:00
Jonne Haß
4fb3170f7f Merge branch 'netom-4257-conversations-timeago' into develop 2013-07-07 14:45:45 +02:00
fabianfiorotto
3e5b29b289 Fix pagination for people list on the tag stream page 
Update _index.html.haml

This params broken the pagination of the followers list in tags page
To reproduce try to paginate in
https://joindiaspora.com/tags/diaspora

test for people pagination patch

reducing the per page limit

removing tabs
 2013-07-06 13:10:29 +02:00
Ruxton
dce1531ba6 Changed follow_diasporahq to be configurable to auto follow any user on join. 
Fixing example config file

Updated changelog
 2013-07-06 13:02:27 +02:00
Fábián Tamás László
aa472b25de Put preloads into gon.preloads 
Fixed tagFollowing not getting into preloads
 2013-07-06 12:45:23 +02:00
Jonne Haß
3da9b1bf7f Merge pull request #4259 from netom/4173-disable-invite-button 
Disable invite button after sending invite

Conflicts:
	Changelog.md
 2013-07-06 12:40:05 +02:00
Jonne Haß
9d4377dc23 Merge pull request #4251 from 0TWAIN0/feature/4182-render-markdown-in-mails 
Feature/4182 render markdown in mails

Conflicts:
	Changelog.md
 2013-07-06 12:20:09 +02:00
kevivmatrix
6623e86a5a private message sending changed to ajax 
added specs for change in controller

one form of hash used in single line of code

rendering create response on sending message

redirect user to conversation page if message sent successfully

removed deprecated way of rendering file

conversations create for mobile fixed

minor code style change

updated changelog
 2013-07-06 14:35:09 +05:30
Jonne Haß
091951a929 bumped unicorn timeout to 90 seconds and made it configurable 2013-07-03 12:52:35 +02:00
twain
e1ca8df15e added strip_markdown to notification mails 2013-07-03 11:16:31 +02:00
Jonne Haß
2c70222a76 add changelog entry for #4277 [ci skip] 2013-07-02 09:16:47 +02:00
Fábián Tamás László
6e178af551 Disable invite button after sending invite 2013-07-01 10:19:56 +02:00
Jonne Haß
30dff802d5 Merge pull request #4243 from davexunit/feature/2948 
Show the user if a contact is sharing with them when viewing their profile page
 2013-06-29 10:16:41 +02:00
Jonne Haß
521aaf894b Merge pull request #4255 from netom/4194-mobile-photo-view 
4194 mobile photo view
 2013-06-29 10:06:46 +02:00
Jonne Haß
92d3bb9c69 Merge pull request #4252 from Raven24/diasp-feature/1283-coppa-admin 
Admin: find users under the age of 13 (COPPA)
 2013-06-29 10:03:59 +02:00
Steffen van Bergerem
71f03544e4 Don't focus comment form on 'show n more comments' 2013-06-28 20:40:24 +02:00
Jonne Haß
e0812c9a0e start new development cycle 2013-06-28 17:50:01 +02:00
Jonne Haß
2e7c571fa7 bump to 0.1.1.0 2013-06-28 17:38:13 +02:00
Jonne Haß
e286531687 remove restriction on guid length 2013-06-28 08:10:57 +02:00
Jonne Haß
e7954132aa bump recommended Ruby version to 1.9.3-p448 
See http://www.ruby-lang.org/en/news/2013/06/27/hostname-check-bypassing-vulnerability-in-openssl-client-cve-2013-4073/
 2013-06-27 17:15:56 +02:00
Florian Staudacher
02be4a5335 make age search postgres compatible, add spec, changelog 2013-06-24 12:34:22 +02:00
Jonne Haß
9c7237ca1c Merge pull request #4244 from svbergerem/4237-consistent-conversation-list 
Show avatar of recent user in conversation list

Conflicts:
	Changelog.md
 2013-06-22 02:38:54 +02:00
Jason Robinson
f30cee3b6e Fix hashtags that start a line when posting to Facebook or Twitter, by applying all the same options to strip_markdown as applying to markdownify, fixes #3768 and #4154 2013-06-20 00:06:13 +03:00
Steffen van Bergerem
ffb150f227 Show avatar of recent user in conversation list 2013-06-19 22:59:05 +02:00
Jonne Haß
221c1bf959 update all wiki links 2013-06-17 20:00:48 +02:00
Jonne Haß
c9e981096c Merge pull request #4229 from davexunit/4227-private-message-error 
Check for nil before splitting contact_ids param in ConversationsController
 2013-06-17 15:30:56 +02:00
Antoine D.
17067d6f79 #4180 was placed in the wrong milestone 2013-06-16 12:05:30 +02:00
Jonne Haß
ed36786edc Merge pull request #4217 from svbergerem/4041-loading-indicator 
Add loading indicator on tag pages, remove second one from profile page

Conflicts:
	Changelog.md
 2013-06-14 18:23:39 +02:00
Steffen van Bergerem
4cbab628c9 Fix login for short passwords 2013-06-14 12:02:44 +02:00
Steffen van Bergerem
a8ade65e1a Add loading indicator on tag pages, remove the second one from the profile page 2013-06-14 01:25:36 +02:00
Jonne Haß
6948462f66 fix changelog [ci skip] 2013-06-13 21:46:32 +02:00
Jonne Haß
c6d158bd81 move asset_sync require to the earliest point possible 2013-06-13 20:57:38 +02:00
Steffen van Bergerem
21ef1c8e41 Remove alpha branding 2013-06-12 23:08:13 +02:00