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

13335 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
5760f177ea fix stupid heredoc usage in script/server 2013-06-02 20:25:10 +02: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
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ß
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
Jonne Haß
8865f72afa Merge pull request #4150 from svbergerem/3746-fix-mentions 
fix mentions at the end of a post
 2013-05-18 10:56:43 -07:00
Steffen van Bergerem
63040bb8cc fix mentions at the end of a post 2013-05-17 19:27:08 +02:00
Jonne Haß
477c9d2ef3 Revert "Do not pass AR objects to Sidekiq" 
This reverts commit 32935be9b1.
 2013-05-17 17:35:53 +02:00
Jonne Haß
e3265aa650 Revert "bump sidekiq" 
This reverts commit 9307a1aaeb.
 2013-05-17 17:35:34 +02:00
Jonne Haß
32935be9b1 Do not pass AR objects to Sidekiq 
In the new version Sidekiq calls JSON.generate on the passed arguments, which blows up with AR objects
 2013-05-17 14:44:57 +02:00
Jonne Haß
e8f57d8fac Revert "downgrade multi_json" 
This reverts commit 4c4a98f42e.
 2013-05-17 13:19:00 +02:00
Jonne Haß
4c4a98f42e downgrade multi_json 2013-05-17 13:12:41 +02:00
Jonne Haß
9307a1aaeb bump sidekiq 2013-05-17 12:30:33 +02:00
Jonne Haß
fdf52ffe9e bump recommended ruby version to 1.9.3-p429 2013-05-17 10:19:20 +02:00
Jonne Haß
848e5d2a57 try to fix Jasmine failure on CI by not overwriting app.views.Location in spec 2013-05-16 23:33:54 +02:00
Jonne Haß
67d7f02faa Merge pull request #4147 from svbergerem/post-preview-locator 
Fix preview with locator feature
 2013-05-08 05:14:30 -07:00
Steffen van Bergerem
da532e18bd Fix preview with locator feature 2013-05-08 13:07:13 +02:00
Jonne Haß
775b560a94 Merge pull request #4131 from Ruxton/patch-1 
Refactoring oEmbed Providers & Adding MixCloud oEmbed support
 2013-05-08 01:28:40 -07:00
Ruxton
4f1bfd7eea oembed_providers.yml added for custom (outside of ruby-oembed) oEmbed providers. 2013-05-07 09:38:30 +08:00