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

13349 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steffen van Bergerem
bcd43cbfee Don't show hovercards for current user in comments 2013-06-09 12:31:18 +02:00
Jonne Haß
c60738654c Merge pull request #4187 from jaywink/2758-twitter-crossposting 
Fix Twitter crossposting by correctly calculating URL shortening
 2013-06-08 12:20:14 -07:00
Jason Robinson
3fa9f6414d Fix Twitter crossposting (#2758). Refactor some service posting related code. 2013-06-08 17:38:07 +03:00
Jonne Haß
a561544905 Merge pull request #4203 from svbergerem/hovercard-medium-avatar 
show medium avatar in hovercard
 2013-06-07 05:12:12 -07:00
Steffen van Bergerem
17876d1de6 show medium avatar in hovercard 2013-06-07 11:23:28 +02:00
Florian Staudacher
653f7566df fix failing conversations cuke 2013-06-05 01:07:05 +02:00
Jonne Haß
9cbfee9408 bump configurate 2013-06-04 22:58:20 +02:00
Florian Staudacher
f694a40992 use tooltip plugin to display the name under the avatar 
(temporary solution until the proposed solution from the
[pull request](https://github.com/diaspora/diaspora/pull/4149) is
implemented)
 2013-06-04 17:14:00 +02:00
Florian Staudacher
c2a9cb55ef Merge branch 'add_conv_participants_preview' of https://github.com/marpo60/diaspora into marpo60-add_conv_participants_preview 2013-06-04 17:12:38 +02:00
Florian Staudacher
b7b4edeeb0 Merge branch 'reoponed_issue3897' of https://github.com/RoonyH/diaspora into RoonyH-reoponed_issue3897 2013-06-04 16:43:16 +02:00
Florian Staudacher
bcb1214f99 Merge pull request #4162 from MrZYX/typhoeus 
bump Typhoeus and refactor HydraWrapper
 2013-06-04 03:36:39 -07:00
Jonne Haß
5760f177ea fix stupid heredoc usage in script/server 2013-06-02 20:25:10 +02:00
Juan Azambuja
3f3fe3ecc7 Add participants preview con conversations 2013-06-01 12:14:16 -03:00
Jonne Haß
619ffa9d74 Merge pull request #4191 from svbergerem/4185-BackToTop-other-streams 
Add back-to-top button on tag and user pages
 2013-05-31 04:56:06 -07:00
Steffen van Bergerem
272cf60788 Add back-to-top button on tag and user pages 2013-05-31 02:02:14 +02:00
Florian Staudacher
608a316bdd remove ["a", "b", "C"] from the void of nothingness [wtf] 2013-05-30 17:24:49 +02:00
Jonne Haß
fc9229430c Merge pull request #4186 from marpo60/fix_issue_4180_deletelabel_after_sprites 
Fix icons-deletelabel styles
 2013-05-30 08:00:03 -07:00
Juan Azambuja
e59066bd66 Fix icons-deletelabel styles 2013-05-27 10:25:04 -03:00
Aruna Herath
7803df5ecd Changed post/comment submit keyboard shortcut to ctrl+enter from shift+enter 
Fixes reopened #3897
 2013-05-27 17:08:39 +05:30
Liane Nakamura
5f25a52676 Fix post iframe src url 
Add test for posts helper
 2013-05-26 20:49:56 +02:00
Jonne Haß
cae70d8194 Merge pull request #4133 from diaspora/fix_tags_ordering 
Fix tags ordering in chrome
 2013-05-25 11:55:53 -07:00
Fabián Rodríguez
aed81c1b3b Fix tags ordering in chrome 2013-05-25 15:44:53 -03:00
Jonne Haß
3b03a7cdde strip trailing newlines from stripped markdown 2013-05-25 15:55:20 +02:00
Jonne Haß
234ebdb2e9 bump redcarpet, should fix #4104 2013-05-25 15:21:17 +02:00
Jonne Haß
d331242d94 Merge branch 'feature/retract_tweets_when_post_retracted' of git://github.com/Ruxton/diaspora into develop 
Conflicts:
	Changelog.md
 2013-05-25 13:50:28 +02:00
Jonne Haß
272f405ab7 Merge pull request #4177 from svbergerem/4157-post-preview-tag-page 
Fix #4157: post preview from tag pages
 2013-05-25 04:46:58 -07:00
Jonne Haß
009209d939 bump Typhoeus and refactor HydraWrapper 2013-05-25 13:45:37 +02:00
Jonne Haß
f2f7800b30 drop fallback donation form 2013-05-25 13:37:17 +02:00
Steffen van Bergerem
7f596cfd36 Fix #4157: post preview from tag pages 2013-05-25 12:39:01 +02:00
Dennis Schubert
cdb4be14ce Merge branch 'hotfix/v0.1.0.1' into develop 2013-05-20 21:29:17 +02:00
Dennis Schubert
1661615fe6 Changelog and version number for the hotfix 2013-05-20 21:28:10 +02:00
Jonne Haß
286e948054 federate location 2013-05-20 21:26:04 +02:00
Dennis Schubert
e33f4e68a8 Fix 500 caused by deleted reshares 2013-05-20 21:25:58 +02:00
Jonne Haß
63b667bbef gracefully handle unavailable git in script/server 2013-05-20 18:14:33 +02:00
Ruxton
48b48470bc Service.delete_post now more generic, for future implementations 
Service.delete_post now accepts post to be more generic and supports deleting post from any service that overrides delete_post(post)
 2013-05-20 12:19:39 +08:00
Maxwell Salzberg
66911801f7 use ActiveRecord#find_each to prevent memory spikes in our workers 2013-05-19 20:33:04 -07:00
Ruxton
20c38a0489 Fix dispatcher_spec to depend on Tumblr which isn't retracting 2013-05-20 11:00:49 +08:00
Ruxton
ba0e2509c9 Twitter service removes status from twitter when post is revoked 2013-05-20 11:00:49 +08:00
Ruxton
a8655e2e8d Add tweet_id column to post 2013-05-20 11:00:00 +08:00
Florian Staudacher
3a0c9893e7 Merge pull request #4145 from MrZYX/refactor_config_directory 
Refactor config/ directory
 2013-05-19 10:40:52 -07:00
Jonne Haß
ac147cc9f4 Refactor config/ directory 
* Get rid of early pathname requirement
* Use require_relative where approciate
* Drop unused files
* Imported new application.rb, environment.rb and environments/* from fresh Rails app
* Cleaned up boot.rb
* Load config in boot.rb
* Deduplicate environments/integration*.rb
* Move username blacklist into defaults.yml
* Ruby 1.9 Hash syntax everywhere
* Reorganize lib/diaspora/markdownify to match conventions
* Get rid of full path requires where possible
* Add dummy content to production section diaspora.yml.example to prevent warning
* Drop sqlite? method
* Move postgres? method into ConfigurationMethods
* Drop token authentication from User
 2013-05-19 18:54:54 +02:00
Jonne Haß
bf90dfffbd start new development cycle 2013-05-19 16:03:01 +02:00
Jonne Haß
9dfb413a96 Merge branch 'release/0.1.0.0' into develop 2013-05-19 16:01:52 +02:00
Jonne Haß
c63bcd5aea Merge branch 'release/0.1.0.0' 2013-05-19 16:01:34 +02:00
Jonne Haß
79c9460e0b change version to 0.1.0.0 2013-05-19 16:01:16 +02:00
Jonne Haß
1c61172b14 updated 186 locale files [ci skip] 2013-05-19 04:49:24 +02:00
Jonne Haß
69e115d234 Add the gem updates section for the current release to the changelog 2013-05-18 23:09:39 +02:00
Jonne Haß
11eecc3d3a 404, not 500, if signed out user wants to see a non public/existing post 
Also add some specs for Post#find_by_guid_or_id_with_user
 2013-05-18 20:55:22 +02:00
Jonne Haß
aa60fac217 Merge branch 'error_404_mobile' of git://github.com/movilla/diaspora into movilla-error_404_mobile 
Conflicts:
	Changelog.md
 2013-05-18 20:06:49 +02:00
Jonne Haß
f5a4bc51c2 Merge branch 'patch-2' of git://github.com/rivendale2010/diaspora into develop 
Conflicts:
	Changelog.md
	app/views/layouts/_header.html.haml
 2013-05-18 20:03:59 +02:00