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

3354 commits

Author SHA1 Message Date
Lukas Matt
d1e3e568b9 Report tab; bootstrap3 compatible, add user detail btn 
The reported_user_details button will redirect you
to admin user_search. This can be useful if the podmin
wants to lock, unlock or delete the account which is
responsible for the reported post

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-10-03 10:58:01 +02:00
Steffen van Bergerem
b40d5362cf Merge pull request #6256 from TeamDeltaQuadrant/5813-show-geolocation-on-osm 
5813 show geolocation on osm
 2015-09-23 01:43:49 +02:00
Jonne Haß
c3c84b95a4 Merge branch 'stable' into develop 2015-09-19 11:33:10 +02:00
Achilleas Pipinellis
9888b4ce43 Add option to set a pid file for unicorn in diaspora.yml 
http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-pid

closes #6411
 2015-09-19 11:33:04 +02:00
realtin
52fac5740e fix indentation & jshint predefines 
according to svbergerem's annotations
 2015-09-10 14:48:25 +02:00
zaziemo
263dc6f119 refactor code that choses the tile server based on podmin's choice 
and remove the possibility to disable the map feature.
By default the application uses the itles of Heidelberg University that
don't need any credentials. If podmins enable the mapbox option in the
diaspora.yml and enter their credentials the mapbox tiles are used for the map
rendering.
 2015-09-09 17:03:46 +02:00
zaziemo
0f3eff8f88 add correct attributions for map tiles of Heidelberg University 
remove personal credentials from mapbox and refactored some code
#5813

Signed-off-by: zaziemo <maren.heltsche@gmail.com>
 2015-09-09 15:24:00 +02:00
realtin
57b7c05c4f set maptile default to OpenMapSurfer 
- refactor code for toggle map function
- adjust jasmine tests for maps and add tests for SPV
- change name of access token in defaults.yml according to naming conventions
- add explanation of map use for podmins
- add location to post_presenter
- fix opening multiple maps inside the stream when clicking on a reshare location
(#5813)
 2015-09-09 12:26:47 +02:00
zaziemo
e5cc8dff0e outsource map credentials 
and allow podmin to enable and disable the feature
(#5813)
 2015-09-09 12:25:45 +02:00
zaziemo
f92a2ee0dd merge address & coordinates in one location object 
to provide a clear arrangement of all location data
- add 'L' to predefs for pronto because it is part of the leaflet library
- fix: show address template only with an address present
with merging the location objects into one, only the objects within
the location object can be empty
(#5813)
 2015-09-09 12:22:48 +02:00
Jonne Haß
176b32c815 Merge branch 'stable' into develop 2015-09-07 12:41:36 +02:00
realtin
15b186518c add moderators to report email recievers 
and refactor coding style according to pull request comments

(#5324)
 2015-09-07 12:31:25 +02:00
Jonne Haß
6fb6b8dc8a Merge branch 'stable' into develop 2015-09-06 13:56:25 +02:00
Jonne Haß
c0da031e33 Merge branch 'release/0.5.3.0' into stable 2015-09-06 13:56:10 +02:00
Jonne Haß
f855fb9718 updated 60 locale files [ci skip] 2015-09-06 13:53:41 +02:00
Jonne Haß
ac6e9fd7c7 Merge branch 'stable' into develop 2015-09-03 21:39:24 +02:00
Jonne Haß
ca5fa14376 Merge branch 'release/0.5.3.0' into stable 2015-09-03 21:39:13 +02:00
Lukas Matt
23c016cf36 Update wiki links in diaspora config 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-09-03 21:38:56 +02:00
Dennis Schubert
f75a6147a5 Bump version number 
[ci skip]
 2015-09-01 03:52:06 +02:00
Dennis Schubert
39fb1a6db2 Merge branch 'stable' into develop 2015-08-30 10:17:28 +02:00
Jason Robinson
0087fefd14 Change default autofollow_on_join_user 
Due to performance of joindiaspora.com, a decision was made to set up a project pod that hosts the official support and news autofollow account (see https://www.loomio.org/d/tyZdcGNo/diasporahq-account-move-to-a-project-pod). The new account is hq@pod.diaspora.software.

closes #6369
 2015-08-30 10:17:05 +02:00
Steffen van Bergerem
9446a3ae21 Merge pull request #6301 from AugierLe42e/image-gallery 
Using Blueimp image gallery
 2015-08-27 23:59:46 +02:00
augier
63bfcb7c98 Using Blueimp image gallery 2015-08-27 23:50:20 +02:00
Steffen van Bergerem
7e9a88573b Merge pull request #6325 from AugierLe42e/add-toggle-mobile-menu 
Add 'Toggle mobile' item to menu + minor styling
 2015-08-27 22:58:00 +02:00
Jonne Haß
24d9be2e68 Merge branch 'stable' into develop 2015-08-27 21:03:16 +02:00
augier
2ce7a1e185 Mobile subdomain 
closes #6354
 2015-08-27 21:01:36 +02:00
Jonne Haß
a30ba5697e Merge pull request #6290 from Raven24/pod_test 
test pods for connectivity
 2015-08-27 11:38:18 +02:00
Faldrian
37793f7dbb beautify ignored people list and add diaspora handle for identification 2015-08-27 09:52:49 +02:00
Florian Staudacher
ea397ffdfb Add connection test for pods in the network 
* add a class for checking pod connectivity
* extend pod model to handle new functionality
* add an admin frontend to list pods and re-trigger checks manually
* add a daily worker to run through all the pods
* add unit tests for most of the new code
 2015-08-24 22:04:53 +02:00
Jonne Haß
aeea030c9a Merge branch 'stable' into develop 2015-08-24 20:30:03 +02:00
Johan
c3041fd516 updating locales es-VE 2015-08-23 20:20:17 -04:30
augier
a7bd029526 Add 'toggle mobile' item to menu + minor styling 2015-08-23 13:53:05 +02:00
Jonne Haß
e54208d39b Merge branch 'stable' into develop 2015-08-23 11:13:47 +02:00
Steffen van Bergerem
a7287f4f93 Disable the handlebars auto-indent feature 
closes #6339
 2015-08-23 11:13:42 +02:00
Jonne Haß
d396d5555f Merge branch 'stable' into develop 2015-08-21 14:23:46 +02:00
Benjamin Neff
663835ed3a remove old webfinger/hcard code 
closes #6310
 2015-08-21 14:23:08 +02:00
Benjamin Neff
21e5bd8697 add save callback for webfinger 2015-08-21 14:21:43 +02:00
Benjamin Neff
65b056341c update federation gem 2015-08-21 14:21:42 +02:00
Steffen van Bergerem
8bc86eb98b Replace jquery.autocomplete with typeahead.js 2015-08-10 22:55:05 +02:00
Jonne Haß
25be9ecfd2 Merge branch 'stable' into develop 2015-08-09 18:35:44 +02:00
theworldbright
d7c92431ae Extract service from comments controller 
closes #6307
 2015-08-09 18:35:11 +02:00
Dennis Schubert
23c83b9447 Merge branch 'stable' into develop 2015-07-29 12:10:36 +02:00
Steffen van Bergerem
d8505b2ae0 Fix conversations view with no contacts 
closes #6266
 2015-07-29 12:08:35 +02:00
Dennis Schubert
e8297f8d6b Merge pull request #6207 from jaywink/social-relay 
Implement social relay requirements
 2015-07-25 23:01:45 +02:00
Dennis Schubert
be8f920c29 Merge branch 'stable' into develop 2015-07-24 04:05:32 +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
Jonne Haß
2ae8b2f611 Load diaspora.yml overrides for test env 2015-07-24 03:47:46 +02:00
Steffen van Bergerem
6fafa731e6 Display locations on mobile devices 2015-07-23 16:06:28 +02:00
Steffen van Bergerem
5d39461443 Display polls on mobile devices 2015-07-23 14:09:38 +02:00
Steffen van Bergerem
5fd89961c4 Use aria-labelledby for conversations 2015-07-22 13:02:16 +02:00
Jonne Haß
0cbe7ec9a8 Merge branch 'stable' into develop 2015-07-22 10:05:46 +02:00
Steffen van Bergerem
f8bbe71f54 Remove correlations 
closes #6223
 2015-07-22 09:46:52 +02:00
Steffen van Bergerem
8f27e8fae8 Improve wording for admin dashboard 2015-07-21 20:43:18 +02:00
Steffen van Bergerem
484e70a68f Add dashboard to admin page 2015-07-21 14:36:41 +02:00
Jonne Haß
3d6ae08e84 Merge branch 'stable' into develop 2015-07-20 17:49:01 +02:00
Jonne Haß
1dd76d7c60 Merge branch 'release/0.5.2.0' into stable 2015-07-20 17:48:10 +02:00
Jonne Haß
c0a0f5e076 updated 24 locale files [ci skip] 2015-07-20 17:45:09 +02:00
Jonne Haß
ccf2fad903 Start 0.5.3.0 development cycle 2015-07-20 00:57:24 +02:00
Jason Robinson
bdf6c71772 Implement social relay functionality 
* .well-known/social-relay - to serve subscription preferences to relays
* Workers.deferred_dispatch relay carbon copy functionality for outbound sending

See discussion here: https://www.loomio.org/d/9vpoe0UR/public-post-federation#comment-730911 and spec here: https://wiki.diasporafoundation.org/Relay_servers_for_public_posts
 2015-07-18 21:29:31 +03:00
Jonne Haß
3a4815996f Merge branch 'stable' into develop 2015-07-17 20:21:19 +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
Jason Robinson
f413d20e27 Merge branch 'stable' into develop 2015-07-14 22:06:26 +03:00
Rich
0c3323088d Rephrase 'Enter an email' 
One does not simply 'enter an email' (should I enter a random email from my Inbox?), instead one enters ones own email address.

closes #6191
 2015-07-14 22:05:34 +03:00
Benjamin Neff
804784ed3f fix @pod_uri/@pod_url and add url_to to AppConfig 2015-07-14 05:50:26 +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
Dennis Schubert
6b6bf84598 Merge pull request #6151 from SuperTux88/federation-gem 
Federation Gem Step 1: Webfinger/HCard generation
 2015-07-12 17:02:23 +02:00
Benjamin Neff
94fc378eb7 fix @pod_uri/@pod_url and add url_to to AppConfig 2015-07-11 11:19:42 +02:00
Jonne Haß
397845161f Merge pull request #6162 from cmrd-senya/5684-public-additional-profile 
Allow additional profile fields (previously private profile) to be set public (new updated version)
 2015-07-11 10:19:19 +02:00
cmrd Senya
7a5a0a909a Allow extended profile fields (previously private profile) to be set public (#5684). 
This adds a new boolean field "public_details" to person model.
By default it is false and represents old behaviour. When it is
set to true, extended profile (bio,location,gender,birthday)
get available to people who didn't log into diaspora and to
people you don't share with (i.e. it is made public).

In UI, a bootstrap-switch added on the profile-edit page in order to
change the setting.

This also changes wording from public/private profile to basic/extended.
The latter could be public and limited.
 2015-07-11 04:36:45 +03:00
Benjamin Neff
46a22fefe9 use federation-gem for webfinger/hcard generation 
remove old webfinger/hcard generation code

this fixes #5143
 2015-07-10 01:46:48 +02:00
Jonne Haß
18c1dcc26a Merge branch 'stable' into develop 2015-07-09 09:02:11 +02:00
Benjamin Neff
2df4a1cc5c add logfile-appender in test environment 
closes #6175
 2015-07-09 09:02:04 +02:00
Jonne Haß
6b240199a8 Merge branch 'stable' into develop 2015-07-04 10:48:42 +02:00
Johan
1e0d81190b updating es-VE locale 
closes #6165
 2015-07-04 10:48:35 +02:00
Steffen van Bergerem
9c4f80346b Use entypo-rails mappings 2015-07-03 15:31:29 +02:00
Jonne Haß
188e554b7b Merge branch 'stable' into develop 2015-06-21 20:48:57 +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
fap
073f028f88 Adds welcome message options to config 2015-06-21 20:48:20 +02:00
Steffen van Bergerem
049c8eb384 Bootstrap header rewrite 2015-06-20 00:38:40 +02:00
Steffen van Bergerem
078e7a722f Merge branch 'stable' into develop 2015-06-19 21:30:15 +02:00
SansPseudoFix
cce5a98537 Add link to pod statistics in right navigation 
closes #6117
 2015-06-19 21:29:25 +02:00
fla
a7d88adde1 Improve services setting translation 2015-06-18 20:36:18 +02:00
Flaburgan
3e4b8500a4 Refactor Account settings page with bootstrap grid 2015-06-18 17:26:31 +02:00
Steffen van Bergerem
b3a5e92eca Remove all faceboxes 2015-06-15 14:09:24 +02:00
Jonne Haß
8a6706337a Merge branch 'stable' into develop 2015-06-15 13:47:01 +02:00
Benjamin Neff
beb06bc42d precompile images from facebox gem 
regression from #6005

closes #6105
 2015-06-15 13:46:07 +02:00
fla
44a12e74b1 Improve mobile conversation design 2015-06-15 12:32:03 +02:00
Jonne Haß
15aa40631e Merge pull request #6104 from svbergerem/jquery-autosize 
Replace jquery.autoresize with autosize
 2015-06-14 22:20:35 +02:00
Steffen van Bergerem
92a3dd53f0 Replace jquery.autoresize with autosize 2015-06-14 20:03:15 +02:00
Jonne Haß
1dee08843b Merge branch 'stable' into develop 2015-06-14 17:42:00 +02:00
Jonne Haß
5a63d201a3 Merge branch 'release/0.5.1.0-RC' into stable 2015-06-14 17:41:42 +02:00
Jonne Haß
7052f2a63b updated 12 locale files [ci skip] 2015-06-14 17:40:55 +02:00
Jonne Haß
1be1bec9c9 Merge branch 'stable' into develop 2015-06-09 22:55:23 +02:00
Benjamin Neff
ce380d78c9 make sql and federation debug-logging configurable 
by default both are disabled now, you can enable them in the
diaspora.yml if you need them.

closes #6090
 2015-06-09 22:55:16 +02:00
Jonne Haß
38b32ca2c4 updated 73 locale files [ci skip] 2015-06-09 05:51:16 +02:00
Jonne Haß
aeeb6570d3 Merge branch 'stable' into develop 2015-06-08 13:52:53 +02:00
Jonne Haß
dd1cea9665 Merge branch 'release/0.5.0.0-RC' into stable 2015-06-08 13:52:42 +02:00
Jonne Haß
baafa9c51b updated 73 locale files [ci skip] 2015-06-08 13:51:17 +02:00
Dennis Schubert
b80785e06e Update Changelog for the upcoming 0.5.2.0 2015-06-08 04:32:29 +02:00
Dennis Schubert
ad52eaf6d7 Merge branch 'stable' into develop 2015-06-08 04:09:57 +02:00
Jan Berdajs
ec4e7b4a69 upgrade Twitter gem - fixes Faraday deprecation warning 2015-06-08 04:08:02 +02:00
efstrian
69c3a4100d Issue #4297: Color themes can override bootstrap variables 2015-06-07 19:58:54 +03:00
efstrian
d64ea15891 Issue #4297: Style fixes - Default theme is configurable 2015-06-07 19:58:14 +03:00
dimana
31d760867c Issue #4297: Updated color themes and testing 2015-06-07 19:57:37 +03:00
efstrian
57d766346c Issue #4297: Enable color theme setup 2015-06-07 19:57:16 +03:00
Jonne Haß
63554e222d Fix production override for listen setting 2015-06-04 22:03:07 +02:00
Steffen van Bergerem
676c0ab611 Add missing translation for lock account 2015-06-04 18:05:44 +02:00
Augier
207b6c6153 Port to Bootstrap 3 
correcting images display on stream sidebar

Corrections on profile page
 2015-06-04 18:05:43 +02:00
Dennis Schubert
b41007fae7 Merge branch 'stable' into develop 2015-06-04 04:18:34 +02:00
Benjamin Neff
b6c46b3fc4 add logging mixin and replace federation-logger 2015-06-04 04:16:03 +02:00
Dennis Schubert
0fdf624690 Merge branch 'stable' into develop 
[ci skip]
 2015-06-02 02:47:28 +02:00
Jason Robinson
d2e0b3ceae Fix Facebook scopes for cross-posting 
Facebook deprecated their v1.0 API and thus the old ones no longer work (for new authorizations).

closes #6019 [ci skip]
 2015-06-02 02:47:20 +02:00
Jonne Haß
c85fe3872e Replace DB environment variable with optional bundler groups 
See the changes to the changelog for more details
 2015-05-29 01:33:12 +02:00
Sandip Trivedi
36d6c5d2ba Remove unnecessary initializer and comments in Gemfile and add explicit rubyzip gem version in Gemfile with description 
closes #6001
 2015-05-28 11:24:30 +02:00
Sandip Trivedi
2ba2ef1b9c Replaces the zipzip gem with the rubyzip gem 2015-05-28 11:23:57 +02:00
Dennis Schubert
d34878df55 Merge branch 'stable' into develop 2015-05-28 01:26:53 +02:00
Benjamin Neff
5655eead7c make the logrotation configurable 
closes #5994
 2015-05-28 01:26:48 +02:00
Dennis Schubert
d4312fbaba Merge branch 'stable' into develop 2015-05-26 03:08:01 +02:00
Benjamin Neff
4f2ee11158 split eye output in 2 logfiles and forward stdout to terminal in dev mode 
closes #5989
 2015-05-26 03:06:42 +02:00
Dennis Schubert
aae11e07ae Merge branch 'stable' into develop 2015-05-25 04:23:33 +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
Dennis Schubert
f9f73f56db Merge branch 'stable' into develop 2015-05-25 04:18:46 +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
Dennis Schubert
70dc4fcab1 Merge branch 'stable' into develop 2015-05-22 02:53:55 +02:00
Benjamin Neff
be3b2852be use logging-logger for sidekiq 
closes #5975
 2015-05-22 02:53:50 +02:00
Benjamin Neff
ac96232d85 use logging gem for better logging with class name and log-level 2015-05-22 02:53:19 +02:00
Benjamin Neff
49f0fb6dcd replace silence_assets.rb with quiet_assets gem 2015-05-22 02:53:19 +02:00
Jonne Haß
ebe0c76040 Listen to unix socket in production by default 2015-05-21 17:23:36 +02:00
Jonne Haß
898e8d5912 Remove deprecated port setting 2015-05-19 11:07:03 +02:00
Dennis Schubert
6a1ec27b3c Merge branch 'stable' into develop 2015-05-19 02:58:41 +02:00
Steffen van Bergerem
ceec5084af Use case insensitive unconfirmed email 
closes #5967
 2015-05-19 02:58:37 +02:00
Dennis Schubert
00cb87ce11 Merge branch 'stable' into develop 2015-05-19 02:55:36 +02:00
Jonne Haß
4bde00177c replace foreman with eye 
closes #5966
 2015-05-19 02:55:31 +02:00
Jonne Haß
a21de8b190 Make listen directive for Unicorn configurable 2015-05-19 02:55:01 +02:00
Dennis Schubert
3ae370780c Merge branch 'stable' into develop 2015-05-16 03:42:18 +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
Jonne Haß
b6cbb17d83 Merge branch 'stable' into develop 2015-05-12 14:20:09 +02:00
goobertron
2668c487e7 Remove dupe line from en.yml [ci skip] 
closes #5951
 2015-05-12 14:20:03 +02:00
Dennis Schubert
aac0a2582e Merge branch 'stable' into develop 2015-05-12 04:00:12 +02:00
Steffen van Bergerem
40bb44eb96 Mobile: manage followed tags 
closes #5945
 2015-05-12 04:00:07 +02:00
Dennis Schubert
3f3148af2c Merge branch 'stable' into develop 2015-05-10 02:00:41 +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
Jonne Haß
ddf1b6ea8b Merge branch 'stable' into develop 2015-05-07 22:08:30 +02:00
Jonne Haß
f0d51e24b8 Fix invalid setting calls in config/unicorn.rb 
* .present? is an AS extension that isn't loaded at this point
* single_process_mode is defined in environment, not at the toplevel
 2015-05-07 22:07:22 +02:00
Dennis Schubert
b05d183f91 Merge branch 'stable' into develop 2015-05-07 04:10:28 +02:00
Steffen van Bergerem
06e6e1db78 Remove private post content of also commented mails 
merges #5931
 2015-05-07 04:10:21 +02:00
Dennis Schubert
642c4597e1 Merge branch 'stable' into develop 2015-05-07 04:03:57 +02:00
Jonne Haß
a7699c2a2c Update configurate and enable missing key exceptions 
closes #5934
 2015-05-07 04:03:43 +02:00