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

721 commits

Author SHA1 Message Date
Jason Robinson
6947a1945c Merge pull request #4883 from MrZYX/uuid 
Use uuids for guid generation
 2014-04-11 16:40:57 +03:00
Jonne Haß
66c511197c Merge pull request #4917 from hpetru/4806-new-status_messages-page 
Redirect to stream_path if is destkop
 2014-04-08 13:45:04 +02:00
goobertron
63abe9055b Reorder items on settings page and improve wording 
Update cukes to be text-independent
Update changelog
 2014-04-08 00:28:25 +01:00
Jonne Haß
5a60cb72bf Merge pull request #4899 from hpetru/poll-in-post-preview 
Add poll in post preview
 2014-04-04 14:12:13 +02:00
Jonne Haß
be19c2f104 Merge pull request #4897 from hpetru/update-poll-view-in-stream 
I update design for poll in post stream
 2014-04-04 09:54:06 +02:00
Jonne Haß
9eb2339368 Merge pull request #4894 from hpetru/4893-poll-in-spv 
Add poll for single post view
 2014-04-03 20:36:34 +02:00
Jonne Haß
211963d320 Merge pull request #4889 from hpetru/4874-malformed-url 
Catch error from decodeURI for prevent crash in posts parsing
 2014-04-01 00:49:27 +02:00
Jannik Streek
167884e565 added changelog pull link 2014-03-31 18:14:08 +02:00
Jannik Streek
a3837a4f19 added changelog entry 2014-03-31 18:14:07 +02:00
Jonne Haß
0ea53aa5ed Merge pull request #4882 from hpetru/4868-mention-inside-tags 
4868 mention inside tags
 2014-03-31 12:06:39 +02:00
Jonne Haß
98057885ac use uuids for guid generation 2014-03-30 15:38:18 +02:00
Jonne Haß
07aec2a630 Merge branch 'hpetru-4864-ui-bug-when-tag-is-long' into develop 2014-03-30 13:39:32 +02:00
Jonne Haß
3a91061d4f Merge pull request #4708 from goobertron/opengraph_link_fix 
Opengraph link fix (issue #4492)
 2014-03-30 11:15:29 +02:00
Jonne Haß
1b70f6fe09 Replace .rvmrc by .ruby-version 
Also relax the requirement. The .ruby-version represents
merely a recomendation for the Ruby version. The incompability
issues in the Ruby world are far less currently, than they were
when we introduced strict version enforcement. Thus strict
enforcement is no longer appropiate. Same holds for RubyGems.

This implicity also removes the recomendation on using RVM.
The .ruby-version file is supported by all major Ruby version
managers. Gemsets are no longer a needed feature since Bundler
handles multiple concurrrently installed Gems just well.
 2014-03-24 15:33:29 +01:00
Jonne Haß
ab15bad53f Merge pull request #4858 from hincupetru/4514-clicking-show-more-comments-empties-textarea 
Save textarea value before rendering comments when clicked 'show more....'
 2014-03-24 14:56:45 +01:00
Steffen van Bergerem
cd241ee94d Hovercards! Everywhere! 2014-03-23 01:15:26 +01:00
Steffen van Bergerem
4fc9c6416e Port notifications to Bootstrap 2014-03-19 18:45:52 +01:00
Steffen van Bergerem
f217a5bc11 Add filters to notifications controller 2014-03-19 17:54:22 +01:00
Hincu Petru
1cef3e42ce I save textarea value before rendering comments when clicked 'show more..' 2014-03-19 12:36:04 +00:00
Jonne Haß
835608f06f Merge pull request #4856 from hincupetru/3692-hashtags-inside-markdown-link 
Check if the hashtag is a link in function .hashtagify
 2014-03-16 14:39:20 +01:00
Jonne Haß
cfca0e88f1 Revert "Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link" 
This reverts commit 06ab498620, reversing
changes made to 3c4d8d95d3.

Conflicts:
	Changelog.md
 2014-03-15 21:08:54 +01:00
Jonne Haß
f2fedea3db Merge pull request #4853 from hincupetru/4693-notifications-hovercard-avatars-misaligned 
Fixed "hovercard avatars misaligned in notifications drop-down"
 2014-03-15 19:15:08 +01:00
Jonne Haß
06ab498620 Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link 
Solved problem with hashtags inside markdown links
 2014-03-15 19:12:37 +01:00
Jonne Haß
3c4d8d95d3 Merge pull request #4794 from Flaburgan/improve-search-page 
Add handle indication on search page, improve design
 2014-03-15 19:09:42 +01:00
Jonne Haß
d4e046ecbc Merge pull request #4787 from hincupetru/4726-infinite-photo-stream 
Added limit by max_time to photos#index for prevent "infinite photo stream"
 2014-03-15 19:07:48 +01:00
flaburgan
027650e856 Add handle indication on search page, improve design 2014-03-13 23:01:42 +01:00
Jonne Haß
11603f5496 Merge pull request #4843 from svbergerem/4228-hovercards-same-pod 
Show hovercards in the notification drop-down for users on the same pod

Conflicts:
	Changelog.md
 2014-03-11 21:50:33 +01:00
MatrixCrawler
3273028ed2 Fix atom feed for reshares of deleted posts. 
Propose for fix #4638

Added Changelog line

Added Specs for testing if the reshared origin post is deleted and therefore not shown in the atom feed
 2014-03-11 21:27:08 +01:00
Steffen van Bergerem
aefcfc7b30 Show hovercards in the notification drop-down for users on the same pod 2014-03-11 20:44:28 +01:00
Steffen van Bergerem
0cc3b10b1f port publisher and bookmarklet to bootstrap 2014-03-10 15:15:40 +01:00
Jonne Haß
bd24cb71a4 Fix plaintext mode for mentionable 
Also slight refactors to it.
 2014-03-09 14:02:15 +01:00
Jonne Haß
4fce682635 Merge pull request #4834 from Faldrian/atomfeedtohtml 
atom-feed content changed to html, use better post-title extractor
 2014-03-09 01:13:38 +01:00
Jonne Haß
a1c222dd23 Merge pull request #4681 from diaspora/upgrade_to_jquery_10 
Upgrade to jquery 10
 2014-02-24 10:29:08 +01:00
Jason Robinson
5fe5507128 Add devise_lastseenable for user last seen tracking. 
Adds a timestamp to user model which is touched when user comes back. Statistics active users counts now use these more reliable timestamps. Fixes #4734
 2014-02-22 23:22:46 +02:00
Jason Robinson
f54931c813 Put #4799 changelog to correct place 2014-02-21 21:51:18 +02:00
Jason Robinson
ea82a91085 Merge pull request #4799 from JannikStreek/feature/4778-comment_counters 
Added count of comments to statistics
 2014-02-21 21:49:25 +02:00
Jason Robinson
d7748718f7 Merge pull request #4793 from Flaburgan/refactor-right-side-bar 
Refactor right side bar, see you, BRs.
 2014-02-21 20:27:02 +02:00
Jannik Streek
d603ff818c added comment count to statistic to calculate posts/comments ratios 
fixeds tests for comment count in statistics

added changelog entry and default entry
 2014-02-21 12:25:23 +01:00
flaburgan
16309dc832 Remove the limit to 8 pictures in the view 2014-02-21 01:31:12 +01:00
flaburgan
a7c7e4b1e3 Refactor right side bar, see you, BRs. 2014-02-20 13:01:07 +01:00
Jonne Haß
57991187d1 Merge branch 'hotfix/0.3.0.3' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-02-19 11:31:02 +01:00
Jonne Haß
1df3f546c9 update rails to 3.2.17 2014-02-19 11:09:06 +01:00
Jason Robinson
283e06bd26 Merge branch 'hotfix/0.3.0.2' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-02-18 22:13:52 +02:00
Jason Robinson
d6d97c17b0 Changelogs for 0.3.0.2, changelog for #4714 2014-02-15 17:04:18 +02:00
Steffen van Bergerem
ab9e7d8035 fix hovercards 
(cherry picked from commit a51c4f0ddc)

Conflicts:
	Changelog.md
 2014-02-15 16:58:12 +02:00
Steffen van Bergerem
a51c4f0ddc fix hovercards 2014-02-15 14:09:03 +01:00
Jonne Haß
adf6c3c009 Merge pull request #4775 from dash-rai/move-mentions-input-plugin 
Moved jquery.mentionsInput plugin
 2014-02-10 21:12:12 +01:00
Jonne Haß
3ed4467155 Merge pull request #4765 from goobertron/jquery_source 
Update JQuery source to jquery.com

Conflicts:
	Changelog.md
 2014-02-10 17:02:09 +01:00
Jonne Haß
3a616469f4 Merge pull request #4707 from goobertron/improved_new_password 
New reset password form

Conflicts:
	Changelog.md
 2014-02-10 01:35:37 +01:00
Jonne Haß
3e3979cc28 Merge pull request #4656 from svbergerem/conversations-add-participants 
Add participants to conversations menu
 2014-02-09 20:20:47 +01:00
Jonne Haß
141438a33e add changelog entry for #4768 [ci skip] 2014-02-09 20:08:23 +01:00
Steffen van Bergerem
a2b3917505 Add participants to conversations menu 2014-02-09 19:55:10 +01:00
goobertron
23e8bfa082 Update JQuery source to jquery.com 2014-02-09 17:36:35 +00:00
Jonne Haß
11b3fe7df4 Merge pull request #4673 from Flaburgan/drawer-scrollable 
New menu for the mobile version
 2014-02-09 18:06:43 +01:00
goobertron
2a145e67ab Update design of forgot_password and change_password forms 
Fix redirect to stream, make labels lower-case

Fix cuke
 2014-02-09 15:48:06 +00:00
Jonne Haß
4a3869cda8 Merge pull request #4769 from Ruxton/feature/faster_stream_queries 
Updating queries for the stream to be faster
 2014-02-09 16:25:59 +01:00
Jonne Haß
a462c84fae Merge branch 'goobertron-rename_messages' into develop 2014-02-09 15:45:15 +01:00
Jonne Haß
17754f1da8 Merge pull request #4747 from Raven24/fix_aspect_stream 
fix regression caused by updating backbone.js in aspect stream
 2014-02-09 15:38:35 +01:00
Jonne Haß
976b21ab05 Merge pull request #4702 from goobertron/new_logos 
Updated image branding (issue #4444)
 2014-02-09 14:47:40 +01:00
Jonne Haß
ecd8a8200b Merge pull request #4754 from svbergerem/small-improvements-spv 
SPV small improvements
 2014-02-09 14:26:41 +01:00
Florian Staudacher
6c9cce7cda Merge branch '4264-embed-youtube-on-https' of https://github.com/arlogn/diaspora into arlogn-4264-embed-youtube-on-https 2014-02-09 13:05:39 +01:00
Steffen van Bergerem
97f1c286f4 improve reshared posts 2014-01-31 22:48:40 +01:00
Steffen van Bergerem
0f156cd9a4 Remove unused beta code 2014-01-24 09:01:30 +01:00
Jonne Haß
0b15e66d06 Merge pull request #4577 from svbergerem/2302-permalink-comments 
[Ready to review & merge] Add permalinks for comments

Conflicts:
	app/assets/stylesheets/application.css.sass
 2014-01-22 11:24:42 +01:00
Steffen van Bergerem
3d4bdfb665 Drop number of followers from tags page 2014-01-21 14:49:05 +01:00
Jason Robinson
590778502d Merge branch 'hotfix/0.3.0.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2014-01-20 23:40:58 +02:00
Florian Staudacher
0c5c17f5e2 fix regression in conversations causing an infinite recursion (fix #4715) 
(cherry picked from commit 5c059b2925)

Conflicts:
	Changelog.md
 2014-01-20 23:39:19 +02:00
Florian Staudacher
5c059b2925 fix regression in conversations causing an infinite recursion (fix #4715) 2014-01-20 22:00:26 +01:00
Jonne Haß
9ea6e9c166 Merge pull request #4517 from Zauberstuhl/report_post_feature 
Added post reporter feature

Conflicts:
	Changelog.md
	app/assets/stylesheets/application.css.sass
	db/schema.rb
 2014-01-20 10:03:45 +01:00
Jonne Haß
0e291fd9c4 Merge pull request #4281 from Ruxton/feature/use_rails_timeago_gem_instead_of_vendored_js 
Switched to using rails-timeago to make keeping on top of new versions o...
 2014-01-20 09:57:10 +01:00
Jason Robinson
93b30dcda4 start new development cycle 2014-01-19 22:47:56 +02:00
Jason Robinson
edbed6c44a bump to 0.3.0.0 2014-01-19 22:38:10 +02:00
flaburgan
565aba5036 Add gems upgrade in the changelog 2014-01-19 20:58:17 +01:00
Steffen van Bergerem
20e1626453 add permalinks for comments 2014-01-17 22:11:17 +01:00
Florian Staudacher
1924c40d38 replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem 
- updates underscore to 1.5.2 and backbone to 1.1.0

backbone had some breaking changes:
- fix url/urlRoot handling in models & collections
- options are no longer attached to the view by default
- collections reset when 'fetch' is called, tell it to keep the existing
  models

other changes:
- fix some events triggering multiple times in connection with deleting
  a model
- use document fragments instead of an element array for stream entries
- adapt jasmine and cucumber specs to the changed code
  * no longer test the backbone router as part of our code
  * jasmine factory already returns model instances, no need to wrap
    that again
 2014-01-16 23:23:30 +01:00
Lukas Matt
5c9a3aaf3e Added post report feature 
You can report a single post by clicking the correct icon in the controler section

Workflow:
* Report a post as offensive
* Trigger alerts to every pod-admin
* Pod-admin can review it in the admin interface
* Delete the post or mark it as reviewed
 2014-01-14 15:00:55 -05:00
Steffen van Bergerem
580068ed7c Remove background from badges in header 2014-01-14 15:00:36 +01:00
Jonne Haß
42f790fa13 Merge pull request #4666 from jaywink/signup-form-error-redirect 
Instead of redirect on signup form validation, render new
 2014-01-11 14:08:18 -08:00
Jason Robinson
35ece9d65f Instead of redirect on signup form validation, render new with submitted data. 2014-01-06 22:12:07 +02:00
Jason Robinson
db71c9c50b Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$ 2014-01-06 22:00:53 +02:00
Damien Monet
b849d6c641 Fix: remove location when publisher is cleared by user 2014-01-05 11:09:03 +01:00
Florian Staudacher
9be0b075ac add changelog entry for #4623 [ci skip] 2014-01-04 01:58:41 +01:00
Jonne Haß
2734471feb Merge pull request #4653 from svbergerem/3119-change-more-comments-link 
Change more comments link
 2014-01-02 01:14:33 -08:00
Steffen van Bergerem
55b967caf9 remove participants popover + improve conversations menu 2014-01-01 21:58:56 +01:00
Steffen van Bergerem
ef128575ae Change more comments link 2013-12-30 13:20:58 +01:00
Jonne Haß
5d83402dc3 Merge pull request #4628 from jaywink/4627-twitter-truncation-problem 
Fix posting to Twitter by correctly catching over limit exception
 2013-12-22 14:14:30 -08:00
Jonne Haß
4dcc712ea1 bump recommended ruby version to 2.0.0 2013-12-21 09:28:03 +01:00
Jonne Haß
b3ebe1a408 Merge pull request #4622 from svbergerem/improve-conversations-view 
Improve conversations view, port to bootstrap
 2013-12-16 12:55:48 +01:00
Jason Robinson
e665ebdab1 Fix posting to Twitter by correctly catching over limit exception (#4627). Also when doing a retry, make smaller cuts to max characters 2013-12-15 22:01:09 +02:00
flaburgan
923a4f2ab4 Add indication about markdown formatting in the publisher 2013-12-13 16:02:39 +01:00
Jonne Haß
c660c90091 Merge pull request #4612 from diaspora/drop_spv_old_code 
Drop spv old code
 2013-12-11 07:41:51 -08:00
Fabian Rodriguez
4adb460c51 add changelog entry 2013-12-10 18:50:30 -02:00
Jason Robinson
4d3c48607a Add mention in changelog about statistics route, relating to already closed and merged #4602 2013-12-08 22:10:20 +02:00
Fabian Rodriguez
c339090f6e Merge branch 'release/0.2.0.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-12-05 09:11:41 -02:00
Fabian Rodriguez
740c0bc082 bump Rails to version 3.2.16 2013-12-04 21:36:54 -02:00
Fabian Rodriguez
90b0cc51a0 bump recommended Ruby version 1.9.3-p484 2013-12-04 21:04:25 -02:00
Jason Robinson
2c83d0e846 Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings. 2013-12-02 22:35:18 +02:00
flaburgan
b6e08fc39f Complete changelog 2013-12-02 11:09:24 +01:00
Jonne Haß
1ce027eb2c Merge pull request #4605 from manwithtwowatches/feature/4509-image-upload-response-errors 
Feature/4509 image upload response errors
 2013-12-02 00:10:25 +01:00
Jonne Haß
d18bbd8405 Merge pull request #4604 from Flaburgan/refactor-mobile-publisher 
Refactor mobile publisher
 2013-12-02 00:07:08 +01:00
Jonne Haß
4b1255fa8d Merge pull request #4592 from Flaburgan/link-show-more-pictures-mobile 
[Ready to review] Fix "more picture" indication (+n) on mobile by adding a link on the indication

Conflicts:
	Changelog.md
 2013-12-02 00:04:37 +01:00
Jonne Haß
8baa06e477 Merge pull request #4590 from diaspora/4432-photo-lightbox-quickfix 
Add lightbox html to unauthenticated header

Conflicts:
	Changelog.md
 2013-12-01 23:58:00 +01:00
Jonne Haß
478159f1cd Merge pull request #4593 from Flaburgan/improve-mobile-design 
Improve notifications and conversations views design on mobile
 2013-11-20 12:05:28 -08:00
flaburgan
58886a6b30 Improve notifications and conversations views design 2013-11-16 03:06:25 -08:00
flaburgan
a02b0519c9 Fix "more picture" indication (+n) on mobile by adding a link on the indication 2013-11-16 02:06:45 -08:00
flaburgan
76b151eb7d Fix avatar display on mobile profile 2013-11-16 01:57:37 -08:00
Raphael Sofaer
6ad083bf5b Mark changelog to note fix for 4432 2013-11-15 15:07:09 -08:00
Jonne Haß
859cd83e38 Merge pull request #4583 from Flaburgan/refactor-mobile-header 
Refactor mobile header, close #4579

Conflicts:
	Changelog.md
 2013-11-10 23:55:55 +01:00
flaburgan
0f2773053e refactor mobile header, close #4579 2013-11-09 23:21:32 -08:00
movilla
1fcd675b3e getting started page mobile error 500. Fix #4534 2013-11-09 19:25:32 -02:00
Fabian Rodriguez
146044bd36 Merge pull request #4578 from taratatach/force-comments-sort-order-in-mobile-spv 
force comments sort order in mobile spv
 2013-11-07 18:16:52 -08:00
Erwan Guyader
0afdb134f8 force comments sort order in mobile spv 2013-11-07 17:19:23 -08:00
flaburgan
3df0fdc09b Improve the management of the contacts visibility settings in an aspect 2013-11-07 12:55:35 -08:00
flaburgan
47645dd985 Put the stream first in the left menu 2013-11-04 17:46:45 -08:00
Florian Staudacher
1c4ad0986c refactor message creation (conversations) 2013-10-20 22:46:53 +02:00
Florian Staudacher
830747a11e refactor conversations_controller#create 2013-10-10 21:42:46 +02:00
Jonne Haß
eea9467846 refactor twitter service model 2013-09-30 10:13:14 +02:00
Florian Staudacher
260d86d501 refactor ConversationsController, move query builing to User model 2013-09-30 01:44:57 +02:00
Florian Staudacher
e614562470 avoid publishing empty posts (fixes #4401) 
invalidate empty posts when created by a local user

add changelog entry
 2013-09-24 21:57:22 +02:00
flaburgan
02ef9e08f6 Remove the (now useless) last post link from the user profile. 2013-09-20 17:37:34 -07:00
Fabian Rodriguez
abc06686ce Merge pull request #4523 from Flaburgan:improve-getting-started 
Conflicts:
	Changelog.md
 2013-09-19 19:37:54 -03:00
Jonne Haß
68da48f0d6 Merge pull request #4079 from Flaburgan/patch-3 
Fix #4078 by refactoring 404.html
 2013-09-19 14:34:34 -07:00
Jonne Haß
ac13e79225 Merge pull request #4529 from Flaburgan/fix-timeago-color 
Change .timeago color and align notification, fix #4502
 2013-09-19 23:32:32 +02:00
Jonne Haß
e6be888707 Merge pull request #4522 from fubik/transparent_background 
Add a white background to images displayed in the lightbox

Conflicts:
	Changelog.md
 2013-09-19 23:27:57 +02:00
PallaviTS
5caa46cc83 fixing commenting 
Added jamisne tests for comments

Added 2 jasmine tests for fixing commenting

Bugfix: #4005 added changelog entry
 2013-09-19 23:22:48 +02:00
flaburgan
126e7bdc9c Refactor getting_started page, test if facebook is available, fix #4520 2013-09-18 22:06:47 -07:00
Antoine D
48dcea0746 Fix #4078 by refactoring 404.html 
I moved 404 to the assets to avoid loading font and images from joindiaspora.

 #- Can I move the design to a 404-style.css file which will be in the public repository too ?
 #- This pull request proposes to insert the two font files and the cat image, do you agree ? Depend of amazon seems really bad for me.
 2013-09-18 15:55:46 -07:00
Jonne Haß
e2825e6ba7 Merge pull request #4525 from marekjm/bugfix/issue-4499 
Fix issue #4499: changed :width in .item_count to :min-width
 2013-09-14 20:23:26 +02:00
Jonne Haß
f76f35c097 Merge branch 'WebSpider-remove_s3_dependency' into develop 2013-09-14 20:17:28 +02:00
Titouan Lorieul
8bad0673b3 Add a white background to images shown in the lightbox 
Fixes issue #4475
 2013-09-13 09:47:57 +02:00
Titouan Lorieul
6bd575d05c Changelog updated 2013-09-12 08:28:47 +02:00
Jonne Haß
72e421b38f Merge pull request #4480 from Raven24/publisher_backbone 
Publisher - now with even more Backbone
 2013-09-04 16:52:30 +02:00
Jonne Haß
78b31f5298 fix some typos in the changelog [ci skip] 2013-09-04 14:50:53 +02:00
sjain1107
e47e5bd3be Added success function and modified changelog.md 2013-09-04 14:47:29 +02:00
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
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