Jonne Haß
1df5c7f7bf
Merge branch 'stable' into develop
2015-10-07 10:58:10 +02:00
Faldrian
a946251a9e
Show getting_started only if user has made no profile changes on the page
...
closes #6456
2015-10-07 10:58:06 +02:00
Steffen van Bergerem
8a02bc6e71
Redesign error pages
2015-09-25 22:24:04 +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ß
0508c1b8d4
Merge branch 'stable' into develop
2015-09-14 22:06:52 +02:00
Steffen van Bergerem
05a6d95811
Always show public photos
...
closes #6398
2015-09-14 22:04:53 +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
e5cc8dff0e
outsource map credentials
...
and allow podmin to enable and disable the feature
(#5813 )
2015-09-09 12:25:45 +02:00
Jonne Haß
176b32c815
Merge branch 'stable' into develop
2015-09-07 12:41:36 +02:00
zaziemo
c2c6ed5dea
refactor moderator role and add specs
...
#5324
2015-09-07 12:32:09 +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
zaziemo
b2dc77e1e6
change method name for a better understanding of what the befor_filter does
...
and correct test syntax
#5324
2015-09-07 12:24:12 +02:00
realtin
bc75371b7a
report controller renders index for the moderator
...
(#5324 )
2015-09-07 12:24:12 +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
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ß
d396d5555f
Merge branch 'stable' into develop
2015-08-21 14:23:46 +02:00
Benjamin Neff
d28e03f053
use discovery from diaspora_federation gem
2015-08-21 14:21:43 +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
Jonne Haß
85f9a0eaa9
Merge branch 'stable' into develop
2015-08-04 10:41:43 +02:00
Mikica Ivosevic
78b0fbbee6
Refactor HomeController#toggle_mobile
...
closes #6260
2015-08-04 10:41:21 +02:00
Jonne Haß
b7864a9976
Merge branch 'stable' into develop
2015-08-02 16:58:07 +02:00
theworldbright
cae5f94af0
Refactor status messages controller
...
closes #6280
2015-08-02 16:58:01 +02:00
Jonne Haß
602ad2d209
Merge branch 'stable' into develop
2015-07-28 18:35: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
Dennis Schubert
04135d7b28
Merge branch 'stable' into develop
2015-07-27 02:05:14 +02:00
Steffen van Bergerem
6fea450777
Fix mobile photos index page
...
closes #6243
2015-07-27 01:59:26 +02:00
Jonne Haß
6ee3843449
Merge branch 'stable' into develop
2015-07-26 13:11:49 +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
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ß
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
484e70a68f
Add dashboard to admin page
2015-07-21 14:36:41 +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
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
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
Dennis Schubert
e0782437b8
Merge branch 'stable' into develop
2015-07-03 05:26: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ß
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
Steffen van Bergerem
049c8eb384
Bootstrap header rewrite
2015-06-20 00:38:40 +02:00
Dennis Schubert
8a4ec1d4c6
Merge branch 'stable' into develop
2015-06-08 04:18:38 +02:00
Benjamin Neff
ed10bea21f
don't dispatch photos twice ...
2015-06-08 04:15:17 +02:00
