Steffen van Bergerem
21ef1c8e41
Remove alpha branding
2013-06-12 23:08:13 +02:00
Jonne Haß
c7909a39cb
add gem updates to changelog [ci skip]
2013-06-12 20:40:15 +02:00
Steffen van Bergerem
a02fdc6e45
unify ignore and hide #bugmash #monday
2013-06-12 14:11:06 +02:00
Florian Staudacher
4ee5d5f19c
replace mentions of out-of-aspect people in limited posts with just a
...
markdown link to their profile (fixes #2516 )
add failing spec for #4160 / #2516
extend the spec a bit more
refactor mention handling in a status message
add method for filtering mentions by aspects
wire mention filtering into the status message model, adapt a few tests to
work properly
cosmetic changes
shorten helper methods
add changelog entry
2013-06-09 19:16:40 +02:00
Steffen van Bergerem
bcd43cbfee
Don't show hovercards for current user in comments
2013-06-09 12:31:18 +02:00
Jason Robinson
3fa9f6414d
Fix Twitter crossposting ( #2758 ). Refactor some service posting related code.
2013-06-08 17:38:07 +03:00
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
Juan Manuel Azambuja
01d91e02d4
Add changelog entry for #4017 & #4107
2013-04-10 11:17:40 -03:00
Jonne Haß
f272c7ed03
Merge branch 'brauliomartinezlm-4058_redirect_to_downcase_version_of_tags' into develop
2013-04-10 10:20:18 +02:00
Aruna Herath
b0879dd256
added same feature to publisher
2013-04-08 19:29:36 +05:30
Aruna Herath
5f6ce87a23
added shift+enter key from new comment box to submit the comment.
2013-04-08 19:08:29 +05:30
movilla
bc87b501f2
Fix show more post in my activity mobile page. Close #4108
2013-04-08 00:04:42 +02:00
Steffen van Bergerem
6e724fc1d4
preview posts in stream
2013-04-07 17:43:27 +02:00
Jason Robinson
9c0c5a7258
Include missing javascript in bookmarklet, regression introduced in commit ffc6c1102e. Fixes #4057
2013-04-07 00:06:02 +03:00
movilla
33ecc50fbc
Mobile buttons are only clickable when scrolled to the top
2013-04-05 19:16:15 +02:00
embs
16cf699d4b
Fix default image url in profiles table. Closes #3795
2013-04-04 19:22:43 -03:00
embs
4ef37c64be
Add explanation to services index page. Closes #3064
2013-04-04 15:51:11 -03:00
Dennis Schubert
3b7bb2c44e
Fix the tag number in sidekiq's changelog notes
...
... it's been a while ...
2013-04-04 12:22:50 +03:00
Dennis Schubert
f3b7d57b3a
Merge pull request #3993 from MrZYX/sidekiq
...
Sidekiq (+ some cleanup)
2013-04-03 15:19:15 -07:00
Steffen van Bergerem
a693a0970b
added hotkeys to navigate in stream
2013-04-02 19:24:20 +02:00
Bruno Machado
29af94ce4e
Remove unnecessary dotted CSS borders. Closes #2940
2013-04-01 15:53:27 -03:00
movilla
8375433788
* Remove unnecessary navigation bar to access mobile site
...
* Re-add flash warning to registrations mobile
* Remove excess :css
* Fix littles css errors
2013-03-30 23:09:45 +01:00
Tom Scott
74690088f2
Update changelog. Apologize for idiocy.
2013-03-30 09:33:42 -04:00
Tom Scott
8a7f6c9fdf
Merge pull request #4067 from movilla/multiphoto
...
Add multiphoto for mobile post. Close #4053
2013-03-30 06:26:07 -07:00
Tom Scott
af8485f47f
Merge pull request #4074 from L3MNcakes/feature/3975-send-profile-update
...
Issue #3976 : Send a profile update alongside a sharing notification
2013-03-30 06:07:16 -07:00
movilla
b257939f7e
Add multiphoto for mobile post
2013-03-30 10:59:06 +01:00
Marcelo Casiraghi
b0f76f1764
Fix confirmation at getting_started page
2013-03-25 23:09:38 -03:00
L3MNcakes
8eed16c245
Issue #3976 : Send a profile update alongside a sharing notification
...
Issue #3976 : Send a profile update alongside a sharing notification
2013-03-24 06:04:47 +00:00
Jonne Haß
79a79d65d6
Bye Resque. Ohai Sidekiq.
...
* Dropped all references to Resque
* Moved all jobs under app/workers since that's the Sidekiq convention
* Renamed Jobs module to Worker to match new location
* Adapted all jobs to Sidekiq
* Replaced all enqueue calls with perform_async
* Dropped Resque hacks from specs and features, replaced with
sidekig/testing in RSpec and sidekig/testing/inline in Cucumber
* Updated scripts to start a Sidekiq server
* Inline Sidekiq sinatra app
* Let Sidekiq create the actual Redis instance
* Workaround already initialized constant warnings in service models
* Resolved ToDo in one job definition by creating proper exception clases
for some errors in receiving posts
* Added sidekiq section to configuration to make it completly
configurable to the user
* Add Sidekiq middleware for clean backtraces
* Delay HttpMulti retry to give offline pods a chance to come back up
* Do not retry on GUID already taken and alike errors
* Be graceful about deleted posts in GatherOEmbedData
2013-03-21 23:39:07 +01:00
Jonne Haß
a55f6fd98c
Merge branch 'hotfix/0.0.3.4' into develop
...
Conflicts:
Changelog.md
config/defaults.yml
2013-03-18 21:10:29 +01:00
Jonne Haß
1a995aa47c
bump rails to 3.2.13, release 0.0.3.4
2013-03-18 21:07:55 +01:00
Jonne Haß
1a58f9cf29
Merge branch 'mobile_comment' of https://github.com/movilla/diaspora into develop
...
Conflicts:
Changelog.md
2013-03-18 20:59:39 +01:00
movilla
bf2bd5a97c
Hide comment button in the mobile view when not signed in
2013-03-18 20:15:55 +01:00
movilla
3990bebcf4
Fix mobile view of deleted reshares
2013-03-18 16:52:37 +01:00
Jonne Haß
e51443b3ef
Merge pull request #4059 from marpo60/remove_unnecessary_javascript_views
...
delete unused javascript views
2013-03-15 11:45:22 -07:00
Juan Manuel Azambuja
06dc53749a
delete unused javascript views
2013-03-15 14:39:34 -03:00
Jonne Haß
d9b36cd312
update changelog [ci skip]
2013-03-15 17:47:09 +01:00
Fabián Rodríguez
d63aff8ea8
update changelog
2013-03-12 20:24:03 -03:00
Jonne Haß
33acc1f7a2
Merge branch 'hotfix/0.0.3.3' into develop
...
Conflicts:
Changelog.md
config/defaults.yml
2013-03-11 21:24:56 +01:00
Jonne Haß
c7283c60a1
release 0.0.3.3
2013-03-11 21:23:28 +01:00
Florian Staudacher
0de68fb713
Merge pull request #4029 from MrZYX/4027-unicode-tags
...
decode tag name before passing it into TagFollowingAction
2013-03-11 05:51:54 -07:00
Jonne Haß
97a8ff65ba
Merge pull request #4048 from marpo60/s3_max_age
...
Set max-age header to Amazon S3 resources
2013-03-10 06:14:49 -07:00
Jason Robinson
affa713616
If post has photos, always include url in post to Facebook to stay consistant with other servies, fixes #3706
2013-03-10 08:15:12 +02:00
Marcelo Dominguez
b950c4f171
Set max-age header to Amazon S3 resources
2013-03-08 16:07:56 -02:00
Jonne Haß
60bd29aa68
decode tag name before passing it into TagFollowingAction, fixes #4027
2013-03-08 13:47:55 +01:00
Florian Staudacher
f8513c2005
Merge pull request #3944 from MrZYX/modular_layouts
...
Modular layouts
2013-03-08 02:50:43 -08:00
embs
e7daa978e3
Show timestamp when hovering on comment time-ago string. Closes #4042
2013-03-08 00:33:19 -03:00
pestrada
18aeeb052b
reset comment box height after posting a comment
...
refactor create comment method
2013-03-07 12:55:03 -06:00
Jonne Haß
55cb070ac9
add header to sign up page
2013-03-06 19:01:07 +01:00
Jonne Haß
ffc6c1102e
dry up and modularize layouts
2013-03-06 19:00:34 +01:00
Jonne Haß
43f21d6e55
Pass the real values to stderr_path and stdout_path in unicorn.rb since it runs a case statement on them
2013-03-05 23:37:51 +01:00
Jonne Haß
ad16451e1f
Merge pull request #4006 from afrerich/feature/3899-long-tags-break-the-layout
...
fade long tag names - refs diaspora/diaspora#3899
2013-03-02 12:20:15 -08:00
aaronf
cd78aa5a65
fade long tag names - refs diaspora/diaspora#3899
2013-03-02 13:57:30 -06:00
Jonne Haß
7b56c2dd52
Do not fail on receiving a SignedRetraction via the public route
2013-03-01 03:38:36 +01:00
Jonne Haß
ccedb6eff0
delegate parent_author to the target of a RelayableRetraction
2013-02-28 17:01:58 +01:00
Jonne Haß
b1cdc30367
Merge pull request #4004 from movilla/upload_photo
...
Upload photo mobile. Close #3324
2013-02-26 15:30:09 -08:00
movilla
76b1e9b0dc
Add the ability to upload photos from the mobile site
2013-02-26 23:25:58 +01:00
Jonne Haß
cf9659de4a
fix XSS vulnerability in conversations#new, closes #4010
2013-02-26 19:09:30 +01:00
Jonne Haß
d6ff67fde2
fix XSS vulnerability in conversations#new, closes #4010
2013-02-26 19:06:01 +01:00
pestrada
3f3409a0a5
avoid posting empty comments
...
fix Jasmine test
updated changelog with bugfix #3836
fix changelog update
remove wrong bug fix line
2013-02-25 18:27:46 -06:00
Jonne Haß
3c9ce435e1
Merge branch 'hotfix/0.0.3.1' into develop
...
Conflicts:
Changelog.md
config/defaults.yml
2013-02-24 17:26:45 +01:00
Jonne Haß
b487c389bc
release 0.0.3.1
2013-02-24 17:25:02 +01:00
Jonne Haß
6bb644f058
Sort tag followings alphabetically, not in reverse, fixes #3986
2013-02-24 17:23:01 +01:00
movilla
5d46baf33e
Wrap text if too long in mobile notifications
...
Conflicts:
Changelog.md
2013-02-24 17:23:01 +01:00
movilla
bfa8b92c57
Fixed removing images from publisher on the profile and tags pages
2013-02-24 17:23:01 +01:00
Jonne Haß
ee0d7b2e8b
move custom splash page login into the controller, fixes #3991
2013-02-24 17:23:01 +01:00
movilla
099f4a61e4
Include our custom fileuploader on the mobile site too
2013-02-24 17:23:01 +01:00
Jonne Haß
e232e164e4
exec foreman in script/server
2013-02-24 17:23:00 +01:00
Jonne Haß
ce8b3c89db
update changelog; replace "pre" releases with a plain "head"
...
Conflicts:
config/defaults.yml
2013-02-24 17:22:56 +01:00
Jonne Haß
0cf1c2d020
Sort tag followings alphabetically, not in reverse, fixes #3986
2013-02-24 16:22:01 +01:00
Fabián Rodríguez
eb8e777873
update changelog
2013-02-24 12:24:35 -02:00
Jonne Haß
19b9b0edb8
Merge pull request #3990 from movilla/mismatch_author_name
...
Wrap text if too long in mobile notifications
2013-02-22 07:51:20 -08:00
movilla
c52a878e86
Wrap text if too long in mobile notifications
2013-02-22 16:15:25 +01:00
Florian Staudacher
f788f3426a
Merge pull request #3946 from MrZYX/feature/1781-include-reshares-in-user-feed
...
Include reshares in the public user feed, closes #1781
2013-02-21 13:37:29 -08:00
movilla
e0d0d0f668
Fixed removing images from publisher on the profile and tags pages
2013-02-21 22:19:24 +01:00
Jonne Haß
35350d1ceb
Include reshares in the public user feed, closes #1781
2013-02-21 14:32:28 +01:00
Jonne Haß
0fd3bcb397
move custom splash page login into the controller, fixes #3991
2013-02-21 13:46:04 +01:00
movilla
5769abcc32
Include our custom fileuploader on the mobile site too
2013-02-20 16:01:08 +01:00
Jonne Haß
5cede18e8d
exec foreman in script/server
2013-02-18 21:31:54 +01:00
Jonne Haß
ba9aee5902
update changelog; replace "pre" releases with a plain "head"
2013-02-18 20:20:50 +01:00
Jonne Haß
35ba082ab5
Merge branch 'overflow_mobile_post' of git://github.com/movilla/diaspora into develop
...
Conflicts:
Changelog.md
2013-02-17 15:48:34 +01:00
Jonne Haß
40b10dc0d9
Merge branch 'overflow_author_infor' of git://github.com/movilla/diaspora into develop
...
Conflicts:
Changelog.md
2013-02-17 15:47:20 +01:00
Jonne Haß
4264804343
Merge pull request #3984 from movilla/frienliar_new_conversation
...
Friendlier new conversation mobile
2013-02-17 06:44:59 -08:00
Jonne Haß
c5e712b17a
fix markdown syntax in the changelog [ci skip]
2013-02-17 15:09:15 +01:00
Jonne Haß
469b361869
update changelog [ci skip]
2013-02-17 14:58:28 +01:00
Jonne Haß
0a124acdf0
Revert "fix regression from #3968 "
...
Revert "Merge pull request #3968 from marpo60/limit_shareable_from_person_queries"
This reverts commit ddfc558a9b .
This reverts commit 30ed4b4e70 , reversing
changes made to f50ce2cb1d .
limiting the fetch of the IDs breaks paginating, there's no quick way to fix that
I left the spec in for future use.
2013-02-16 23:48:10 +01:00
movilla
ce76f12591
friendlier new-conversation mobile
2013-02-16 22:53:43 +01:00
movilla
dfcc8e7c80
Overflow info_author mobile web
2013-02-16 14:51:51 +01:00
movilla
4d6110246e
Overflow name author mobile post
2013-02-15 17:44:54 +01:00
Jonne Haß
ad4ba363a9
Merge branch 'hotfix/0.0.2.5' into develop
...
Conflicts:
Changelog.md
Gemfile.lock
config/defaults.yml
2013-02-11 20:54:35 +01:00
Jonne Haß
f2ce9fa17f
* Fix CVE-2013-0269 by updating the gems json to 1.7.7 and multi\_json to 1.5.1. [Read more]( https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58 )
...
* Additionally ensure can't affect us by bumping Rails to 3.2.12. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8 )
* And exclude CVE-2013-0262 and CVE-2013-0263 by updating rack to 1.4.5.
2013-02-11 20:51:02 +01:00
Lennart Prelle
2d0abe8309
added a id and a autoscroll to first unread message in conversation ( Fix : #3216 )
2013-02-11 16:15:01 +01:00
movilla
63f1d1c197
friendlier mobile buttons
2013-02-09 15:23:04 +01:00
Jonne Haß
30ed4b4e70
Merge pull request #3968 from marpo60/limit_shareable_from_person_queries
...
limit ShareablesFromPerson queries to improve performance
2013-02-06 05:27:07 -08:00
Fabián Rodríguez
38cf1efdd4
update changelog
2013-02-05 23:52:04 -02:00
movilla
4343914cdb
Twitter/Facebook/Tumblr count down characters is hidden by the picture of the post
2013-02-04 21:31:48 +01:00
Ruxton
60f5173c77
Spec coverage for changelog_url and adjustment to behaviour
2013-02-04 11:00:57 +08:00
movilla
0ea7bc5258
Adapt css for search mobile page
2013-02-02 23:23:22 +01:00
Jonne Haß
865152be90
Merge pull request #3949 from movilla/gettins_started
...
Add Getting_Started page mobile. Close #3854
2013-02-02 08:00:16 -08:00
movilla
27813ec5dd
Excessive padding with select aspect in mobile publisher
2013-02-02 16:41:14 +01:00
movilla
507e8ee199
Add Getting_Started page mobile
2013-02-02 16:02:19 +01:00