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
