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

7935 commits

Author SHA1 Message Date
Steffen van Bergerem
67653cf465 Update backbone.js 
closes #6262
 2015-07-29 10:04:18 +02:00
Mikica Ivosevic
c8b01cb62c application_controller.rb 
refactor method after_sign_out_path_for

closes #6258
 2015-07-28 18:35:13 +02:00
cmrd Senya
fa411c73a7 Remove unused minified js files mbp-respond.min.js and mbp-modernizr-custom.js (#5939). 
closes #6257
 2015-07-28 18:24:10 +02:00
Steffen van Bergerem
6fea450777 Fix mobile photos index page 
closes #6243
 2015-07-27 01:59:26 +02:00
theworldbright
2a3dde1ae5 Refactor PostService and extract its tests 
Squashed commits:

[ada0f09] Remove favorites from Posts table

closes #6208
 2015-07-26 13:10:24 +02:00
theworldbright
d724397168 Refactor posts controller 2015-07-26 12:58:42 +02:00
Jonne Haß
b9bc20c7ce Backport statistics page to Bootstrap 2 2015-07-24 11:30:34 +02:00
Jonne Haß
c76cf90b62 Readd legacy services to statistics.json 2015-07-24 10:57:37 +02:00
Jonne Haß
d68b3f02bd Expose whether chat is enabled as NodeInfo metadata 
related to #6211
 2015-07-24 04:16:54 +02:00
Jonne Haß
b7064677ff Collapse StatisticsController into NodeInfoController 2015-07-24 03:51:31 +02:00
Jonne Haß
487b0d90ca Implement NodeInfo 2015-07-24 03:50:02 +02:00
Steffen van Bergerem
aa53763b98 Fix peeping tom on 404 error page 
closes #6226
 2015-07-22 11:55:24 +02:00
Steffen van Bergerem
f8bbe71f54 Remove correlations 
closes #6223
 2015-07-22 09:46:52 +02:00
Dennis Schubert
53c3ef1d2b Merge branch 'release/0.5.2.0' into stable 2015-07-20 03:52:22 +02:00
Steffen van Bergerem
cf4143f4a1 Remove jquery-idletimer 2015-07-20 03:51:03 +02:00
Ivan Korunkov
5ca9ca9844 Default home page: fix wiki link title; GitHub wiki is obsolete, because it has been moved from GitHub to independent resource. 
closes #6212
 2015-07-20 01:31:22 +02:00
Ivan Korunkov
c98dacdfab Default home page: fix indent level; fix indentation level for configuration message block to make it looks like other blocks. 2015-07-20 01:29:00 +02:00
Rich**
48f5aed63e Make default conversation subject translatable and properly capitalize it 
closes #6206, closes #6205
 2015-07-17 20:20:00 +02:00
Alex Chvatal
634aa7b09a capitalize Wiki in the links sidebar. closes #6188 
closes #6193
 2015-07-14 09:58:43 +02:00
Benjamin Neff
e4ca9f01e2 fix jsxc_helper_spec and use new url_to in jsxc_helper 
closes #6151
 2015-07-13 23:52:13 +02:00
Benjamin Neff
f875be8d5b use federation-gem for webfinger/hcard generation 
remove old webfinger/hcard generation code

this fixes #5143
 2015-07-14 05:50:26 +02:00
realtin
9eadc251ae added post guid to the post_serializer 
closes #6185
 2015-07-11 00:17:01 +02:00
zaziemo
787c1cfce9 add spec and code to include guid in comment's export 
#6115
 2015-07-11 00:16:24 +02:00
Dennis Schubert
b5b5f1f028 Revert "Issue #6145: Set a fixed body-height" for global side effects 
This reverts commit 990c678cd3.
 2015-07-07 02:50:30 +02:00
Haidy777
990c678cd3 Issue #6145: Set a fixed body-height 
closes #6169
 2015-07-07 02:46:34 +02:00
Benjamin Neff
b0a9a6342f add url_to 
closes #6168
 2015-07-05 20:46:18 +02:00
Benjamin Neff
f45e053316 remove unused publics_helper 
the Subscriber stuff was removed in 2010:
f97218c005
 2015-07-05 20:44:24 +02:00
Benjamin Neff
540b8df1b8 don't get url from hcard, is already set from webfinger 
prepare for federation refactoring
 2015-07-05 20:44:24 +02:00
Benjamin Neff
2294e59ee3 change public_url to atom_url and profile_url 2015-07-05 20:44:24 +02:00
cmrd Senya
fe3ff10e07 Add new daily job to clean cache in public/tmp (as suggested in #5946). 2015-07-03 16:34:01 +02:00
theworldbright
d410d2ee76 Fix bug where flash error reappeared #6136 
closes #6146
closes #6136
 2015-07-03 05:25:22 +02:00
Jonne Haß
6601576149 Merge branch 'master' into stable 2015-07-02 11:11:58 +02:00
Dennis Schubert
e92c8000ba Do not leak private profile fields in JSON format 
Signed-off-by: Dennis Schubert <mail@dennis-schubert.de>
 2015-07-02 10:07:59 +02:00
fap
1061e101fd Adds welcome message on registration Welcome message is only send out if podmin account is defined and welcome message is enabled in the config. 
This also enables the podmin account to send messages
to any local user.

closes #6128
 2015-06-21 20:48:48 +02:00
Faldrian
0fa571d5e4 Fixed more-button wording when there are <15 posts 2015-06-19 22:17:21 +02:00
SansPseudoFix
cce5a98537 Add link to pod statistics in right navigation 
closes #6117
 2015-06-19 21:29:25 +02:00
Pablo Cuadrado
c050c606c2 this was causing an empty element to be created 
closes #6111
 2015-06-17 12:40:22 +02:00
Jonne Haß
3a527d01da Remove top margin for first heading in a post 
That is, if it's the first element in the post

closes #6110
 2015-06-16 23:43:14 +02:00
Steffen van Bergerem
5516926b74 Update perfect-scrollbar 
closes #6085
 2015-06-08 16:59:27 +02:00
Benjamin Neff
ed10bea21f don't dispatch photos twice ... 2015-06-08 04:15:17 +02:00
Jan Berdajs
ec4e7b4a69 upgrade Twitter gem - fixes Faraday deprecation warning 2015-06-08 04:08:02 +02:00
Benjamin Neff
010afa1019 refactor: iterate over visiblities 
closes #6060
 2015-06-08 00:45:16 +02:00
Benjamin Neff
0ffb83d351 load conversations and visibilities in one query with correct order 2015-06-08 00:44:41 +02:00
Benjamin Neff
735d692ac0 fix selected week on weekly stats page 
closes #6079
 2015-06-07 21:14:47 +02:00
Benjamin Neff
27b4a44e4a replace Rails.logger with logging-logger 
closes #6041
 2015-06-04 04:17:15 +02:00
Benjamin Neff
b6c46b3fc4 add logging mixin and replace federation-logger 2015-06-04 04:16:03 +02:00
Steffen van Bergerem
1b77258d0e Set default for post title truncation to 70 characters 
closes #6022
 2015-06-02 12:14:35 +02:00
Benjamin Neff
03dbb75dd5 don't save default avatars to the database 2015-06-02 02:32:01 +02:00
Benjamin Neff
a7fa3eabcb Disable autocorrect/autocapitalize for the username 
and cleanup the code so it follows the code guidelines

closes #5955

closes #6028
 2015-06-02 00:44:47 +02:00
Steffen van Bergerem
35e75b3c64 Atom feed: set post title length to 50 and use configured pod name in the feed title 
closes #6020
 2015-06-01 04:55:27 +02:00
theworldbright
45a5e3d1c5 Change markdown-content hr style #5987 
The <hr> tag in the markdown-content was #eee,
and thus almost invisible. It has been changed to
$border-gray (currently #ddd) to be consistent
with the other <hr> tags.

Adjust markdown-content hr style further

The hr tag is now centered at 85% width. It also
adds a default vertical margin that is equivalent
to the 0.8em the paragraph tags provide.

Refactor scss for markdown-content hr

Closes #6016
 2015-05-31 20:39:55 +02:00
Benjamin Neff
76ca4fdc70 use image_url for the logo in mails 
closes #6013
 2015-05-31 01:49:38 +02:00
Jonne Haß
ac52cef546 Only return the current_users participation for post interactions 
closes #6007
 2015-05-30 03:08:25 +02:00
Sandip Trivedi
b026a2afe8 Replaces facebox vendored asset with rails gem #5194 
closes #6005
 2015-05-29 11:41:57 +02:00
Benjamin Neff
604ffb445a optimized sprites 
- move mobile icons to mobile-folder, so they aren't included in the
  icons-sprite
- move logos to branding/logos, and create a logos-sprite without the
  big other branding-images
- delete duplicate images

closes #6004
 2015-05-29 11:39:30 +02:00
Benjamin Neff
247e9efe49 remove unused branding images 2015-05-29 11:39:01 +02:00
Benjamin Neff
bd8888291d remove more old assets 2015-05-29 11:39:01 +02:00
Benjamin Neff
a22be8a4cb remove unused social media logos and add attribution 2015-05-29 11:39:01 +02:00
Benjamin Neff
36b1568d32 remove old unused icons (mostly replaced by entypo) 2015-05-29 11:39:00 +02:00
Sandip Trivedi
2ba2ef1b9c Replaces the zipzip gem with the rubyzip gem 2015-05-28 11:23:57 +02:00
Benjamin Neff
21ae93e658 handle when the diaspora xml parser returns nil 
closes #5991
 2015-05-28 01:34:24 +02:00
Dennis Schubert
62e8f87f2c Do not mute ActiveRecord::RecordNotUnique for now see #5971, regression from #5938 
closes #5992
 2015-05-26 05:25:39 +02:00
Benjamin Neff
b491ecac31 wrap the sidekiq logger to add the context info again 
closes #5988
 2015-05-25 04:23:28 +02:00
Jason Robinson
7c0e50c2c2 Introduce 'authorized' configuration option for services 
Since the Facebook API has changed and additional permissions are required for all users on a pod to cross-post, an additional 'authorized' flag is needed to be set for the Facebook service.
This flag allows either all users, one user or no users to use the cross-posting service.

Clarifies the situation for #5923, #5260 and #5085.

closes #5985
 2015-05-25 04:18:38 +02:00
Benjamin Neff
986ad0df14 fix validation for status-message when the author is missing 
closes #5986
 2015-05-24 11:16:05 +02:00
Benjamin Neff
8531b160a6 gracefully handle when a like is already deleted again 
closes #5983
 2015-05-24 02:30:02 +02:00
Benjamin Neff
68f7208ff5 use id from preloaded gon.post to fix broken liking with guid 
closes #5978
 2015-05-23 01:24:09 +02:00
Benjamin Neff
be3b2852be use logging-logger for sidekiq 
closes #5975
 2015-05-22 02:53:50 +02:00
Benjamin Neff
9cc0faa4e6 fixes reshares with no text but with photo 
regression from 1da1c53f203e6eb9dad50872e573a4965219ef92

closes #5976
 2015-05-21 00:46:50 +02:00
Benjamin Neff
9a4a7255e7 remove unused older and newer methods for posts 
last renamed in 8386179f16

closes #5970
 2015-05-19 10:42:39 +02:00
Benjamin Neff
289753e068 add "original post deleted" message on single post view 
closes #5968
 2015-05-19 03:00:51 +02:00
Benjamin Neff
cde9b24476 fix margin/padding for "original post deleted"-message 2015-05-19 02:59:31 +02:00
Benjamin Neff
267a1df3c4 fix root_diaspora_id when root was deleted 2015-05-19 02:59:31 +02:00
Steffen van Bergerem
ceec5084af Use case insensitive unconfirmed email 
closes #5967
 2015-05-19 02:58:37 +02:00
Benjamin Neff
a396a246ee remove unused hasPhotos and hasText functions 
- added in a836b06d3e
- removed in 49ea8c8563

closes #5969
 2015-05-18 03:31:11 +02:00
Benjamin Neff
494c03a3fd re add user atom feed on profile-page 2015-05-18 03:23:15 +02:00
Benjamin Neff
196e438286 remove some hardcoded diasporahq hax 2015-05-18 03:23:14 +02:00
Benjamin Neff
d74e20a790 fetch public posts when someone starts sharing with you 
closes #5960
 2015-05-16 13:54:01 +02:00
Steffen van Bergerem
716952dc0d Put 'email not visible' text into popover/tooltip 
closes #5956
 2015-05-16 03:42:14 +02:00
Akash Agrawall
8c7aa38aba Indicates in the setting that the email is not visibile to the other users #5315 2015-05-16 03:41:52 +02:00
Jason Robinson
ce16a122fc Fix missing localization of inactive user removal warning emails. 
Fixes #5950
 2015-05-16 03:40:06 +02:00
Jason Robinson
aec2467e98 Fix inactive user removal not respecting configuration for daily limits 
It seems ActiveRecord ignores .limit() if .find_each() is used to iterate the query (http://stackoverflow.com/a/6680541/1489738). Using .each() instead. Added a test.

closes #5953
 2015-05-16 03:36:25 +02:00
Steffen van Bergerem
40bb44eb96 Mobile: manage followed tags 
closes #5945
 2015-05-12 04:00:07 +02:00
Dennis Schubert
1a4e3cef48 Mute ActiveRecord::RecordInvalid due to ignores 
closes #5943
 2015-05-10 14:26:21 +02:00
Dennis Schubert
32f95a860c We don't always have invalid record messages ... so log the exception message instead. 2015-05-10 14:25:50 +02:00
Steffen van Bergerem
0c5443d543 Make js-routes use compact and camelcase function names 
closes #5941
 2015-05-10 02:00:30 +02:00
Steffen van Bergerem
1428369849 Mobile: Add button to follow/unfollow tags 2015-05-10 01:59:50 +02:00
Dennis Schubert
6273c2959a Rescue from private objects sent to the public api 
closes #5938
 2015-05-10 00:10:12 +02:00
Dennis Schubert
915dee3c4b Mute some ActiveRecord::RecordNotUnique exceptions 2015-05-10 00:09:25 +02:00
Steffen van Bergerem
05ec235ea3 Pass along current_user in ContactPresenter#full_hash_with_person 
closes #5936
 2015-05-09 23:48:59 +02:00
Steffen van Bergerem
06e6e1db78 Remove private post content of also commented mails 
merges #5931
 2015-05-07 04:10:21 +02:00
Rich
2ce0e8045b Change <subtitle> branding on atom feeds 
Minor consistency change ( from Diaspora to diaspora* )

closes #5929
 2015-05-05 18:02:14 +02:00
Steffen van Bergerem
399fdb2c7d Check request.format :mobile in home controller 2015-05-05 01:39:48 +02:00
efstrian
63be9d57b6 Issue #5884: Added link to diasporafoundation.org to invitation email (en) 2015-05-04 04:42:08 +02:00
Steffen van Bergerem
0cffa00004 Add syntax highlighting for markdown content 2015-05-04 04:04:34 +02:00
Steffen van Bergerem
dd2e1ea29e Use rails-assets for jquery.elastic.js 2015-05-04 03:51:20 +02:00
Steffen van Bergerem
a22127bfb1 Add ctrl+enter shortcut for conversations 2015-05-04 03:38:42 +02:00
Steffen van Bergerem
1fc31cc313 Fix close account for mobile view 
and use Bootstrap modal for desktop close account
 2015-05-04 03:31:28 +02:00
Jonne Haß
2c7848e3cb Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations" 
This reverts commit 096fa2ddbb, reversing
changes made to f7d1105148.
 2015-05-04 00:36:27 +02:00
Jonne Haß
59e8fc93a2 Merge pull request #5559 from SWW13/aspect_sort 
Readd aspect sorting
 2015-04-30 13:02:24 +02:00
Steffen van Bergerem
31bbfe8eab Merge pull request #5887 from szlend/5874-fix-bold-links 
Issue #5874 Fix styled links
 2015-04-30 11:05:24 +02:00
Benjamin Neff
28c9cfdfd4 write cucumber test and add order_id on create 2015-04-28 02:38:28 +02:00
Benjamin Neff
3c09756417 refactoring javascript and controller 
- move to contacts.js
- use json
- move to aspects_controller
- add route
- rewrite test
- fix css in chrome
 2015-04-28 01:57:43 +02:00
Simon Wörner
cee4f1c3cd fixed aspect sorting, added minimal jquery ui, added test 2015-04-26 01:57:00 +02:00
Simon Žlender
f5ce612299 Issue #5874 Fix styled links 2015-04-25 16:51:11 +02:00
Martin Artnik
283f22fc84 Fix unconventional image asset inclusion in css asset 2015-04-25 16:18:27 +02:00
Simon Wörner
4c13fd2b42 Revert "remove aspect sorting logic" 
This reverts commit 8d8d3c649a.

Conflicts:
	app/assets/javascripts/main.js
 2015-04-25 02:16:54 +02:00
Dennis Schubert
c95dd68545 Merge pull request #5883 from SuperTux88/fix-camo-on-contacts-page 
use camo for medium and small avatars
 2015-04-25 01:26:28 +02:00
Dennis Schubert
67a6c8be0c Merge pull request #5877 from SuperTux88/fix-notification-mails 
fix notification mails for limited posts
 2015-04-25 01:09:46 +02:00
Benjamin Neff
344b198900 use camo for medium and small avatars 2015-04-24 03:10:48 +02:00
Jonne Haß
0bad6dba88 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-22 20:58:54 +02:00
Jonne Haß
6e546ff2bf Trigger exports through a POST request 
GET requests don't get any CSRF protection by Rails,
thus these sensitive actions should be better protected.

Thanks to @tomekr for the report.
 2015-04-22 20:20:10 +02:00
Jonne Haß
0a70e51f74 Add a token the filename for exported user data 
Also redirect to it for download, for Amazon S3
compatibility.

Prior to this patch an attacker could obtain an
users export by guessing the filename with a high
chance of success. Fully authenticating the
download request is a lot harder due to our diverse
deployment scenarios.

This brings the used method in line with the photo
export feature.

Thanks to @tomekr for the report.
 2015-04-22 20:19:17 +02:00
Benjamin Neff
84c3814b94 fix notification mails for limited posts 2015-04-22 19:59:08 +02:00
Steffen van Bergerem
8e2103e69b Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 22:26:22 +02:00
Steffen van Bergerem
7648b58c15 Merge pull request #5875 from SuperTux88/add-mumble-protocol 
add mumble protocol to linkify
 2015-04-21 22:17:43 +02:00
Jonne Haß
61c890f274 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 22:02:28 +02:00
Steffen van Bergerem
6bb5e0a29b Only render hovercard if the mouse is still on the username 2015-04-21 22:02:18 +02:00
Benjamin Neff
6cbb959700 add mumble protocol to linkify 
also use double-quotes in the whole file
 2015-04-21 21:16:55 +02:00
Jonne Haß
c8f990359d Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 20:50:27 +02:00
Steffen van Bergerem
a14713b985 Update markdown-it, disable fuzzy links 2015-04-21 20:50:16 +02:00
Jonne Haß
9a9cf6f6a5 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 20:48:41 +02:00
Steffen van Bergerem
2d3c0680ea Fix uppercase registration/login labels and btn style 2015-04-21 20:48:30 +02:00
Jonne Haß
9d4916709b Merge branch 'release/0.5.0.0-RC' into develop 2015-04-20 22:40:12 +02:00
Jonne Haß
37ec00f80b Merge pull request #5854 from svbergerem/remove-managing-services-standalone 
Remove 'manage services' link in standalone mode
 2015-04-20 22:36:11 +02:00
Jonne Haß
d959dd725b Merge pull request #5850 from svbergerem/modal-for-new-aspect 
Use Bootstrap modal for new aspect form
 2015-04-20 22:34:51 +02:00
Benjamin Neff
128cfb247c fix not_public page 
body was rendered in the head
 2015-04-20 22:32:32 +02:00
Jonne Haß
e996bd7e36 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-20 21:49:55 +02:00
Jonne Haß
6fe06f6d3c Merge pull request #5868 from SuperTux88/fix-service-icons 
fixed service-icons in sidebar
 2015-04-20 21:49:46 +02:00
Benjamin Neff
13a6b1389d fixed service-icons in sidebar 
recovered css from old application.scss

was removed in e188782a9a
 2015-04-20 21:49:36 +02:00
Jonne Haß
a06448447a Merge branch 'release/0.5.0.0-RC' into develop 2015-04-20 21:19:49 +02:00
Benjamin Neff
0211da4116 fix control icon alignment in chromium browser 2015-04-20 21:06:17 +02:00
Jonne Haß
85c376e591 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-19 15:58:41 +02:00
goobertron
a75ec75ec7 Update aspect edits text, reorder posting section 
First iteration to update Help section

Changes from Fla
 2015-04-19 15:57:21 +02:00
Marcelo Briones
6636a89118 Add participation counter 2015-04-11 14:41:17 -03:00
Asphyxia
5fb328864e Activity stream keeping retracted participations 2015-04-10 21:46:42 -03:00
Jonne Haß
5481ddb540 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-10 19:23:00 +02:00
Jonne Haß
ec2a209b68 Lazily initialize Contact proxy in service helper 
This prevents connecting to the database on rake assets:precompile,
which fails in certain build environments.

Running git blame on this and figuring out what in gods name this
is for, is for another time.
 2015-04-10 19:19:16 +02:00
Steffen van Bergerem
895d38de21 Refactor available services settings 2015-04-08 18:43:35 +02:00
Steffen van Bergerem
b885b8583d Remove 'manage services' link in standalone mode 2015-04-08 12:49:05 +02:00
Steffen van Bergerem
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02:00
Steffen van Bergerem
a6b9c6c057 Return 406 on people/guid/contacts, format json 2015-04-04 03:48:44 +02:00
Jonne Haß
4b841ef076 Merge pull request #5843 from margori/private_post_subject_content 
Limited post content excluded from subject of comment email
 2015-04-04 00:39:40 +02:00
Marcelo Briones
aa6b590b3c Limited post content excluded from subject of comment email 2015-04-03 16:37:17 -03:00
Steffen van Bergerem
07a344d051 Disable auto follow back on aspect deletion 2015-04-03 14:10:14 +02:00
Jonne Haß
bec2508545 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-03 02:21:59 +02:00
Steffen van Bergerem
3e5eb350ae Notification dropdown: 'mark all as read' link scroll fix 2015-04-03 02:21:06 +02:00
Jonne Haß
0155d8972a Merge pull request #5839 from svbergerem/use-test-instead-of-match 
Use test instead of match wherever possible
 2015-04-01 23:54:42 +02:00
Steffen van Bergerem
f8707e0e1a Use test instead of match wherever possible 2015-04-01 18:35:20 +02:00
Jonne Haß
099bb01005 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-01 18:28:08 +02:00