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

437 commits

Author SHA1 Message Date
Jonne Haß
5eb5057864 Merge pull request #4351 from netom/3711_fix_stream_render_time 
Batch insert new posts to stream
 2013-09-01 19:36:07 +02:00
Jonne Haß
fb7de8a4f5 Merge branch 'ssrihari-highlight-current-stream' into develop 2013-09-01 19:33:36 +02:00
Jonne Haß
991a505439 Merge pull request #4485 from colindean/rename_bitcoin_wallet_id 
change bitcoin_wallet_id to bitcoin_address
 2013-09-01 19:24:44 +02:00
Jonne Haß
99657947a9 Merge pull request #4487 from arlogn/word-wrap-on-single-post-view 
Prevent overflow of strings too long on single page view
 2013-09-01 19:23:07 +02:00
Jonne Haß
0cdfc7cfbd Make I18n systems more robust against missing keys in pluralization data 
Should make situations like #4468 less frequent
 2013-08-30 19:31:48 +02:00
Jonne Haß
9d092c1b2f Merge pull request #4479 from ssrihari/fix-colors-more 
Refactored the colors palette a little more
 2013-08-30 15:23:05 +02:00
Jonne Haß
e38966cec0 Merge branch 'WebSpider-develop' into develop 2013-08-30 14:44:07 +02:00
Jonne Haß
08dcc8c52d Merge branch 'ssrihari-fix-colors' into develop 2013-08-30 10:37:24 +02:00
Jonne Haß
27f671814b Merge pull request #4471 from svbergerem/fix-size-of-images-in-spv 
Fix size of images in the SPV
 2013-08-29 21:37:10 +02:00
Steffen van Bergerem
6bc16bcdba Fix preview with more than one mention 2013-08-29 20:36:49 +02:00
Jonne Haß
d40b09878a Merge branch 'ssrihari-hide-inactive-streams' into develop 2013-08-29 14:53:24 +02:00
Jonne Haß
eda65f3258 Merge pull request #4464 from movilla/profile_mobile_500 
Error 500 when visit probile mobile and logged out. Fix #4458
 2013-08-29 05:19:18 -07:00
movilla
2b97f74015 error 500 when visit probile mobile and logged out. Fix #4458 2013-08-29 12:18:53 +02:00
Jonne Haß
26e13c5edf Merge branch 'ssrihari-disable-mark-all-read' into develop 2013-08-29 12:13:32 +02:00
Jonne Haß
e194a07f18 Merge branch 'develop' of github.com:diaspora/diaspora into develop 
Conflicts:
	Changelog.md
 2013-08-28 20:43:01 +02:00
Jonne Haß
e24e024f5f Merge branch 'ssrihari-click-to-select-invite-link' into develop 2013-08-28 20:41:33 +02:00
svbergerem
fa7a03e9a7 Fix style in profile sidebar / contacts 2013-08-28 13:07:01 +02:00
Florian Staudacher
ba9e715c66 Merge branch '4239-move-federation-stuff-into-lib' of github.com:oliverbarnes/diaspora into oliverbarnes-4239-move-federation-stuff-into-lib 2013-08-27 22:05:27 +02:00
Jonne Haß
17580c123d Merge pull request #4353 from netom/oembed_to_mobile_view 
Added oembed display to mobile stream view

Conflicts:
	app/views/status_messages/_status_message.mobile.haml
 2013-08-27 21:59:00 +02:00
Jonne Haß
c94ca826b2 Merge pull request #4448 from ssrihari/fix-invite-code-input-width 
Fixing Invite code input width to be same across browsers
 2013-08-27 21:48:29 +02:00
Jonne Haß
f86ecdb327 Merge pull request #4441 from ssrihari/user-menu-highlight 
Hightlighting the down-arrow next to user name on hover
 2013-08-27 21:46:56 +02:00
Jonne Haß
625159c8ad start new development cycle 2013-08-27 09:59:46 +02:00
Jonne Haß
2919c7c73f bump to 0.2.0.0 2013-08-27 09:57:46 +02:00
flaburgan
3899e383ee Re align check icon in aspect dropdown 2013-08-26 21:24:02 +02:00
Steffen van Bergerem
324b09a72a add help page 2013-08-26 15:26:18 +02:00
Jonne Haß
f9a3990562 do not leak photos through photos#show 2013-08-26 09:39:39 +02:00
Jonne Haß
e58019fe8e Merge pull request #4440 from Flaburgan/fix-contacts-page 
Add aspect modification and fix check icon regression on contacts page, close #4397
 2013-08-25 15:46:11 -07:00
Jonne Haß
20adeae204 add gem updates to changelog [ci skip] 2013-08-25 23:05:44 +02:00
flaburgan
96e18c6a7b Add aspect modification and fix check icon regression on contacts page, close #4397 2013-08-25 21:42:32 +02:00
Jonne Haß
2d18184653 Merge branch 'ssrihari-header_icons_hover' into develop 2013-08-25 11:51:41 +02:00
Jonne Haß
1b7bc02eee Merge pull request #4410 from rogerbraun/feature/spv-redesign 
New single post view

Conflicts:
	app/assets/stylesheets/application.css.sass
 2013-08-22 10:37:25 +02:00
Roger Braun
039cf4dea1 Fix changelog.md 2013-08-22 09:56:36 +02:00
flaburgan
abba8d8dfc Add header to the single post view 2013-08-22 09:56:34 +02:00
Steffen van Bergerem
7fe972555a profile message and mention icons 2013-08-21 23:05:42 +02:00
flaburgan
ba886d127a Valid meta elements, add pod personalization 2013-08-21 10:30:20 +02:00
Steffen van Bergerem
e5e63b09a3 fix opacity of control icons 2013-08-20 12:20:24 +02:00
Steffen van Bergerem
f22b4d7da7 Change contact list on profile page 2013-08-19 14:02:08 +02:00
carolina
d107e7d11d Changelog.md changed 2013-08-19 12:49:38 +02:00
Jonne Haß
caae0d6af6 Merge pull request #4358 from arlogn/2943-fix-embedded-media-over-elements 
Fix the overlapping of youtube embedded videos
 2013-08-19 09:23:42 +02:00
Jonne Haß
684067be4f Merge pull request #4409 from movilla/remove_comments 
Remove comments from the mobile site. Close #4225
 2013-08-16 15:21:35 -07:00
movilla
d1c679cc22 remove comments from the mobile site. Close #4225 2013-08-16 22:14:52 +02:00
Jonne Haß
22db89a361 Merge pull request #4408 from movilla/reremove_post 
Remove post from the mobile site
 2013-08-16 12:21:31 -07:00
movilla
73825ab94a Remove post from the mobile site 2013-08-16 20:44:22 +02:00
Jonne Haß
3b06184d72 Merge pull request #4398 from movilla/deleted_reshared_mobile 
Mobile Error 500 if a reshared (original) post will be deleted.

Conflicts:
	Changelog.md
 2013-08-16 14:08:53 +02:00
Jonne Haß
30778ffbd0 Merge pull request #4407 from rogerbraun/feature/spv-photo-background-removal 
SPV photo background removal,
 2013-08-16 14:07:43 +02:00
movilla
795a7a5751 mobile error 500 if a reshared (original) post will be deleted. 2013-08-16 12:07:14 +02:00
Jonne Haß
2207069b86 Merge pull request #4396 from movilla/registration_mobile_width 
Fix layout on the registration page for mobile

Conflicts:
	Changelog.md
 2013-08-14 21:28:17 +02:00
movilla
77c4731157 fix layout on the registration page for mobile 2013-08-14 13:52:52 +02:00
flaburgan
485c0dae7f Remove placeholders for name fields in settings (no more Sofaer) 2013-08-13 19:03:16 +02:00
movilla
152c08963a fix mobile search tags 2013-08-12 16:01:26 +02:00
flaburgan
96337ef7d4 Fix regression in header style 2013-08-11 23:23:15 +02:00
Jonne Haß
041f7b7402 Merge branch 'max258-develop' into develop 2013-08-11 15:34:07 +02:00
Jonne Haß
f4169d7f30 Merge pull request #4384 from andrewcsmith/bug/4211-twitter-should-not-cut-links 
Fixed problem where the add_post_link method would truncate the status update in the middle of a link
 2013-08-11 00:25:12 +02:00
Sean Tilley
e7ea763ab5 Merge pull request #4373 from Flaburgan/patch-4 
Make contacts visible in new aspect unchecked by default, close #4343
 2013-08-10 15:00:16 -07:00
Jonne Haß
948939cd30 Merge pull request #4381 from goobertron/4380-facebook-count 
Updated Facebook character limit.
 2013-08-10 21:40:44 +02:00
Jonne Haß
cbfcea7198 Merge pull request #4379 from Flaburgan/fix-welcome-banner 
Remove overflow hidden on welcome banner, close #4377
 2013-08-10 12:02:58 +02:00
Antoine D
ef24275f7c Make contacts visible in new aspect unchecked by default, close #4343 2013-08-09 22:13:40 +02:00
Jonne Haß
a2e5f1f88e Merge pull request #4335 from Team-D/feature/4169-tag_search_autocomplete 
#4169 tag search autocomplete
 2013-08-06 13:29:12 -07:00
Jonne Haß
a267f2a4db Merge pull request #4354 from Flaburgan/improve-mobile-view 
Improve mobile usability

Conflicts:
	Changelog.md
 2013-08-06 21:31:55 +02:00
Jonne Haß
efbd3c8605 Merge pull request #4344 from oliverbarnes/4124-check-twitter-write-access-before-auth 
Issue #4124 Check write access before authorizing Twitter
 2013-08-06 21:21:56 +02:00
Jonne Haß
a67e2dc1cd Merge pull request #4348 from svbergerem/4346-post-preview-auto-expand 
auto expand post preview

Conflicts:
	Changelog.md
 2013-08-06 21:17:35 +02:00
Jonne Haß
1ab14ef368 Merge pull request #4337 from oliverbarnes/4312-index-key-too-long 
Limit index key length when creating oembed caches

Conflicts:
	db/schema.rb
 2013-08-06 20:52:37 +02:00
Steffen van Bergerem
8a8fb10b18 auto expand post preview 2013-08-06 20:48:27 +02:00
Jonne Haß
1639ae2b31 Merge pull request #4316 from Flaburgan/feature/4271-refactor-left-side-bar 
Feature/4271 refactor left side bar
 2013-08-06 11:45:15 -07:00
flaburgan
aa27b7a1f5 Resize preview button 2013-08-06 18:40:20 +02:00
flaburgan
ac533f8383 Refactor the left bar side menu, improve tag autosuggestion design, close #4271 2013-08-06 18:30:24 +02:00
flaburgan
086d512d83 Improve mobile usability 2013-08-06 17:05:35 +02:00
Oliver Azevedo Barnes
55a58713a5 Issue #4124 Check write access before authorizing Twitter 2013-08-05 13:52:19 -05: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
mokus
df9a42c397 update search controller + serch.js so that autocomplete works 
Added search_controller_spec, moved some tests from people_controller_spec to search_controller_spec

Fixed merged conflict in Changelog

update routes and search controller

remove useless except from search controller

Fix indentation in search_controller
 2013-08-05 11:49:23 +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