Steffen van Bergerem
64773d883e
Add permalink for stream elements
2015-10-06 23:29:09 +02:00
Jonne Haß
e2d895c636
Merge branch 'stable' into develop
2015-10-05 15:22:55 +02:00
Jonne Haß
c5819b9c57
Enable SQL logging by default in development mode
2015-10-05 15:22:28 +02:00
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
