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

319 commits

Author SHA1 Message Date
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
Jonne Haß
b8128d356b Merge branch 'hotfix/0.0.2.4' into develop 
Conflicts:
	Changelog.md
	app/views/people/show.html.haml
	config/defaults.yml
	spec/helpers/layout_helper_spec.rb
 2013-02-01 22:24:37 +01:00
Jonne Haß
7134513b28 Fix XSS vulnerabilities caused by not escaping a users name fields when loading it from JSON. #3948 
From a quick look at the for us available databases this was not actually used in the wild.
 2013-02-01 22:20:31 +01:00
Asphyxia
6df84ed703 Fix wrong message on infinite scroll on contact page 2013-01-31 23:09:51 -03:00
Asphyxia
07ae4e618c Repeated post on stream fails when content is the same 2013-01-31 22:01:09 -03:00
Asphyxia
1ed0318db7 Reshare alert box is appearing twice 2013-01-31 14:52:47 -03:00
Asphyxia
b91ed859a1 Hovering a Timeago-String should show the Timestamp 2013-01-31 13:43:37 -03:00
Asphyxia
389e93a3ae Stream form on profile page 2013-01-31 00:15:27 -03:00
Jonne Haß
d398365641 Merge branch 'movilla-settings_mobile' into develop 2013-01-29 15:13:19 +01:00
Jonne Haß
4eb98cd7dc Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile 
Conflicts:
	Changelog.md
 2013-01-29 14:58:11 +01:00
Fabián Rodríguez
8c6b539224 update changelog 2013-01-29 10:02:46 -02:00
Jonne Haß
099b4063d2 Merge pull request #3932 from marpo60/improve-tags-query 
don't join the tags table here, it makes the query slower
 2013-01-29 03:56:49 -08:00
Jonne Haß
6ded1238c7 bump configurate 2013-01-29 12:54:35 +01:00
Fabián Rodríguez
130e4cfbd2 update changelog 2013-01-28 19:24:27 -02:00
Jonne Haß
74613b0b15 Merge branch 'hotfix/0.0.2.3' into develop 
Conflicts:
	Changelog.md
	Gemfile.lock
 2013-01-28 20:41:25 +01:00
Jonne Haß
8a8ee42ebc Update Devise to 2.1.3 
http://blog.plataformatec.com.br/2013/01/security-announcement-devise-v2-2-3-v2-1-3-v2-0-5-and-v1-5-3-released/
 2013-01-28 20:38:30 +01:00
movilla
0010819343 add settings web mobile 2013-01-27 20:38:19 +01:00
Asphyxia
6ee921235e Side panel ui changes 2013-01-27 08:04:33 -03:00
Jonne Haß
946121f672 Merge pull request #3827 from diasp/feature/1338-links-sidebar 
Show links in sidebar #1338
 2013-01-26 04:09:22 -08:00
Diaspora Europe
6d4e577676 show links in sidebar #1338 2013-01-26 11:59:15 +01:00
Diaspora Europe
e8d86f09bb resize full scaled image to a specific width #3793 2013-01-26 11:36:01 +01:00
movilla
5d3e9f5c3d Excesive padding with "user-controls" in single post view 2013-01-25 17:34:23 +01:00
Jonne Haß
cb640b91b3 Merge pull request #3880 from Ruxton/feature/oembed_providers 
Oembed Update - Added instagram, better display for rich/photo
 2013-01-25 07:50:24 -08:00
Ruxton
e8decc200e Adding jasmine coverage for oEmbed updates 2013-01-25 23:47:49 +08:00
Jonne Haß
ed2258a294 Merge pull request #3849 from asphxia/feature/3806-overflow-comment-textarea 
Issue #3806: Overflow comment textarea
 2013-01-25 03:24:34 -08:00
malavbhavsar
4629afb1f5 Fix services index view. 2013-01-24 23:00:53 -05:00
Asphyxia
f2c67b0d8a Overflow comment textarea 2013-01-24 22:52:14 -03:00
Asphyxia
7f34c7af7a Issue #3874: Distorted profile thumbnail 2013-01-21 22:43:48 -03:00
Asphyxia
1af0f4bf2d Issue #3828: Unify hide and ignore options 2013-01-18 16:08:02 -03:00
Asphyxia
d6a9818632 Issue #3851: Profile pictures not centered 2013-01-18 15:51:59 -03:00
Asphyxia
5a6090a0fb Issue #3846: Wrong message on mobile 2013-01-18 15:40:00 -03:00
Asphyxia
284c40b4da Issue #3840: Fix extra blank on streams 2013-01-18 15:25:01 -03:00
Asphyxia
c0dd888e61 Issue #3832: Logged-out users stream options 2013-01-18 15:10:13 -03:00
Jonne Haß
d6bc226e27 update changelog for gem changes 2013-01-17 13:19:50 +01:00
Fabián Rodríguez
ed21b327f8 update changelog 2013-01-16 20:14:38 -02:00
Diaspora Europe
fe2a6b5f85 Write unicorn stderr and stdout log 2013-01-16 13:11:33 +01:00
Diaspora Europe
ac3b2bc99f pod version in footer and updated link to changelog #3705 2013-01-15 16:45:10 +01:00
Fabián Rodríguez
af6db5c043 update changelog 2013-01-12 04:52:59 -02:00
Diaspora Europe
c8ddba6b3e add images to notifications 2013-01-11 12:30:12 +01:00
Jonne Haß
414e29f23e remove merge conflict marker 2013-01-09 00:17:26 +01:00
Jonne Haß
a09a8cbffc Merge branch 'hotfix/0.0.2.2' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-01-09 00:11:29 +01:00
Florian Staudacher
b320e50236 bump Rails to 3.2.11 
see:
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
 2013-01-09 00:09:07 +01:00
Jonne Haß
c6f92198ba Merge pull request #3813 from Flaburgan/feature/3811-update-and-refactor-default-public-view 
Feature/3811 update and refactor default public view
 2013-01-07 10:31:16 -08:00
Flaburgan
3c84f2e0bd Update and refactor default public view, close #3811 2013-01-07 18:04:51 +01:00
Jonne Haß
38eba6703e add Armenian pluralization rule 2013-01-03 23:32:50 +01:00
Jonne Haß
26139fc2dc Merge branch 'hotfix/0.0.2.1' into develop 
Conflicts:
	Changelog.md
	Gemfile
	Gemfile.lock
	config/defaults.yml
 2013-01-02 23:45:53 +01:00
Jonne Haß
11f82c794e Bump to Rails 3.2.10 as per CVE-2012-5664 
https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53
 2013-01-02 23:40:46 +01:00
Blaž Hrastnik
d3f5f34fa0 Load the entire lib folder refactor. 
Removed hack, replaced with a proper solution.
 2012-12-30 13:08:16 +01:00
Florian Staudacher
0092acd492 re-add hovercards 
* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
 2012-12-28 22:37:13 +01:00
movilla
597ab20715 Show error and flash-notice when sending messages to non contacts 2012-12-26 12:23:37 +01:00
movilla
c1b858a877 Mark all unread post-related notifications as read, if one of this gets opened 2012-12-24 00:13:32 +01:00
movilla
ceace52762 Add progress percentage to upload images 2012-12-20 21:24:09 +01:00