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

264 commits

Author SHA1 Message Date
Steffen van Bergerem
17876d1de6 show medium avatar in hovercard 2013-06-07 11:23:28 +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
Juan Azambuja
3f3fe3ecc7 Add participants preview con conversations 2013-06-01 12:14:16 -03:00
Steffen van Bergerem
272cf60788 Add back-to-top button on tag and user pages 2013-05-31 02:02:14 +02: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
Fabián Rodríguez
aed81c1b3b Fix tags ordering in chrome 2013-05-25 15:44:53 -03: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ß
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
Ruxton
ba0e2509c9 Twitter service removes status from twitter when post is revoked 2013-05-20 11:00:49 +08: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ß
79c9460e0b change version to 0.1.0.0 2013-05-19 16:01:16 +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
Steffen van Bergerem
63040bb8cc fix mentions at the end of a post 2013-05-17 19:27:08 +02:00
Steffen van Bergerem
da532e18bd Fix preview with locator feature 2013-05-08 13:07:13 +02:00
Ruxton
4f1bfd7eea oembed_providers.yml added for custom (outside of ruby-oembed) oEmbed providers. 2013-05-07 09:38:30 +08:00
Jonne Haß
e462b95316 add changelog entry for locator [ci skip] 2013-05-06 17:34:55 +02:00
Braulio Martinez
00a3332013 Remove unnecessary ruby187 hacks 2013-05-02 10:07:30 -03:00
Jonne Haß
d2c9295389 Merge pull request #4111 from Raven24/install_refactor 
refactor install script
 2013-05-01 13:33:35 -07:00
movilla
19d22a8928 fix missing translation back to top 2013-05-01 19:22:53 +02:00
Florian Staudacher
4005cd05ea refactor install script 
the script is now split up in parts that will be fetched from github
on demand.
fixes #4047
 2013-05-01 14:01:11 +02:00
rivendale
4f8ce5cb98 Update Changelog.md 2013-04-29 10:57:28 -03:00
movilla
5839d304db Fix reactions link on mobile broken 2013-04-25 13:55:57 +02:00
movilla
f17d16385f mobile private post dont show error 404 2013-04-24 22:17:47 +02:00
Jonne Haß
25b3f6bcdc Merge pull request #4127 from marpo60/fix_aspects_max_selection 
Fix select & deselect all aspects check image
 2013-04-22 08:34:13 -07:00
Juan Manuel Azambuja
06ef58bc97 Add changelog entry for pull 4127 2013-04-22 10:25:24 -03:00
Florian Staudacher
c1b680e51d show username of the services in the publisher 
original work by @Ruxton
rebased and extended to include feedback from the original PR #3959
 2013-04-21 23:29:04 +02:00
Jonne Haß
322f4da4d8 Embed associated photos into the status message xml 2013-04-21 19:44:09 +02:00
Jonne Haß
aca134d54a Refactor script/server 
* Made style consistent
* Add helper functions to print messages
* Abort script if critical command fails
* Made number of started Sidekiq workers configurable again
 2013-04-15 17:03:41 +02:00
Florian Staudacher
f3aa802a0d remove capistrano from the main source code repo 
capistrano deployment scripts will be maintained in a separate deployment repo
 2013-04-15 00:50:23 +02:00
movilla
c1479b36ca Correction typos for changelog and activity mobile feature 2013-04-13 22:24:07 +02:00
Jonne Haß
3572ae8d2e Merge branch 'remove_navbar' of git://github.com/movilla/diaspora into movilla-remove_navbar 
Conflicts:
	Changelog.md
 2013-04-13 13:04:52 +02:00
Jonne Haß
fd069af2c6 Merge branch 'activity_more' of git://github.com/movilla/diaspora into movilla-activity_more 
Conflicts:
	Changelog.md
 2013-04-13 12:53:31 +02:00
Jonne Haß
7a0d1c647a Merge pull request #4096 from RoonyH/3897-submit_a_comment_by_shift+enter 
3897 submit a comment by shift+enter
 2013-04-13 03:49:40 -07:00
Jonne Haß
bef05c14d7 Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop 
Conflicts:
	Changelog.md
 2013-04-10 18:24:47 +02:00
Jonne Haß
15418eae67 Merge pull request #4112 from marpo60/issues_4017_4107_fixes 
close issues #4017 and 4107 by including jquery.textchange
 2013-04-10 07:58:30 -07:00