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

3382 commits

Author SHA1 Message Date
Jonne Haß
9346fadefc
Merge branch 'stable' into develop 2016-06-07 13:11:52 +02:00
Jonne Haß
c8aa323d13
Set ca_file explicitly for the mail gem too 2016-06-07 13:11:32 +02:00
Jonne Haß
a5c9579c77
Merge branch 'stable' into develop 2016-06-07 12:30:40 +02:00
Jonne Haß
27569d4baa
OpenSSL verification modes other than none and peer make no sense for 
TLS client connection, remove them from the examples.
 2016-06-07 12:29:21 +02:00
Dennis Schubert
db5714d75f
updated 73 locale files [ci skip] 2016-05-21 19:00:35 +02:00
Dennis Schubert
aaf1f4741c
updated 73 locale files [ci skip] 2016-05-21 18:57:20 +02:00
Dennis Schubert
a2864b9f40
Merge branch 'release/0.5.9.0' 2016-05-17 03:05:43 +02:00
Dennis Schubert
230ec02ad7 Merge branch 'stable' into develop 2016-05-06 02:20:38 +02:00
sjain1107
4cd2f1d9c1 Add inviter diaspora-ID to the invite email #6796 
closes #6817
 2016-05-06 02:20:31 +02:00
Lukas Matt
c10c31b52b Adjust links and description in diaspora config 2016-04-25 15:30:28 +02:00
Lukas Matt
f0d5ff12a2 Diaspora configuration wrapper for Prosody 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2016-04-25 15:30:28 +02:00
Dennis Schubert
d6171e53c3 Merge pull request #6778 from Zauberstuhl/facebook_review_changes 
Changes for my successful facebook reviews
 2016-04-21 06:50:57 +02:00
Dennis Schubert
ec6ad16d94 Merge branch 'release/0.5.8.0' 2016-04-04 03:10:13 +02:00
Lukas Matt
b9cf5995b8 Use provider name in translation 2016-03-31 13:18:35 +02:00
Steffen van Bergerem
6941cdc962 Add noscript warning 2016-03-31 13:17:56 +02:00
Dennis Schubert
eba9e8f829 Prepare 0.5.9.0 cycle 
[ci skip]
 2016-03-30 16:52:00 +02:00
Lukas Matt
267d91bf66 Changes for a successful facebook review 
I had two facebook reviews in the past days
Removing the display type and adding a explicit
'Share to' provider tag did the trick

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2016-03-30 10:36:28 +02:00
Dennis Schubert
e95c742aa1 Merge branch 'stable' into develop 2016-03-30 10:18:09 +02:00
Benjamin Neff
69f08a4a7e add fetch callbacks 2016-03-30 10:01:54 +02:00
Benjamin Neff
a3ed9da210 changes for new federation-gem version 2016-03-30 09:45:46 +02:00
Dennis Schubert
6270e22226 Start hotfix 0.5.7.1 2016-03-08 22:25:21 +01:00
Benjamin Neff
e6b72b526f remove "not public" error page 
this is not used anymore:
* not logged in users are redirected to the login page
* logged in users see the normal 404 page
 2016-03-07 05:52:54 +01:00
Benjamin Neff
d94eae0d45 refactoring PostService 
* move presenters back to controllers, this is view-logic
* use PostService in CommentService
* remove iframe route, this is not used anymore
* id/guid limit at 16 chars, hex(8) is 16 chars long
 2016-03-07 05:52:54 +01:00
Dennis Schubert
91d636b9f6 Merge pull request #6727 from SuperTux88/improve-pod-check 
Improve pod check
 2016-03-05 06:03:20 +01:00
Benjamin Neff
acb91c79d2 improve pod connection check 
* use port for check
* respect entries in /etc/hosts
* test /.well-known/host-meta
* don't allow redirects to other domains
 2016-03-05 02:57:11 +01:00
Benjamin Neff
b1a6516474 add migration for pods-table 
* add port to pods
* remove url from person and link people with pod-table
 2016-03-05 00:12:54 +01:00
Steffen van Bergerem
f948120ba6 Refactor keycodes 2016-03-04 18:02:22 +01:00
Dennis Schubert
091c426004 Merge pull request #6672 from k0kubun/hamlit 
Use Hamlit to render Haml
 2016-03-01 07:16:25 +01:00
Dennis Schubert
4cb0d18a63 Merge branch 'stable' into develop 2016-02-22 11:27:45 +01:00
Dennis Schubert
fbabc541ae updated 111 locale files [ci skip] 2016-02-22 11:26:04 +01:00
Dennis Schubert
56ebcc7600 Remove version number padding 
[ci skip]
 2016-02-22 04:58:36 +01:00
Dennis Schubert
81ced55fed Merge branch 'release/0.5.7.0' 2016-02-22 04:53:06 +01:00
Jonne Haß
086b6e4529 Merge branch 'stable' into develop 2016-02-16 11:19:10 +01:00
Steffen van Bergerem
9eb0dddb1a Speed up asset serving in development 
closes #6702
 2016-02-16 11:19:04 +01:00
Dennis Schubert
24c24374bf Start 0.5.8.0 cycle [ci skip] 2016-02-15 01:49:15 +01:00
Dennis Schubert
5d77708aa8 updated 111 locale files 2016-02-09 13:15:21 +01:00
Dennis Schubert
677bddc3d3 Merge branch 'stable' into develop 2016-02-09 12:42:26 +01:00
Steffen van Bergerem
ac5a7746e2 Remove contacts_title method and translations 
closes #6687
 2016-02-09 12:42:21 +01:00
Steffen van Bergerem
482cbe7fcc Add reason for post report to email sent to admins 2016-02-07 17:58:03 +01:00
Takashi Kokubun
3028f8e9ad Use Hamlit to render Haml 2016-02-07 14:39:25 +09:00
Steffen van Bergerem
0c05b474c5 Merge pull request #6509 from AugierLe42e/fix-mobile-comment 
Refactor mobile comment section
 2016-02-05 11:30:04 +01:00
Augier
a5198e9a01 Fix no reaction case 2016-02-03 16:06:24 +01:00
Benjamin Neff
ce407568d9 fix queues for cron jobs 
remove the queues from the schedule.yml so the configured queue in the worker is used
 2016-01-28 23:46:37 +01:00
Dennis Schubert
72fe5a79c2 Prepeare 0.5.6.3 hotfix-hotfix 2016-01-26 14:59:33 +01:00
Dennis Schubert
c04ee239c6 Prepare 0.5.6.2 hotfix 2016-01-26 14:26:10 +01:00
fla
1e27b509f9 Add number of votes on poll answers 2016-01-24 14:31:06 +01:00
Dennis Schubert
5f986464da Drop Redis namespace support 2016-01-24 07:29:28 +01:00
cmrd Senya
ed61ef6d6a Replace sidetiq with sidekiq-cron 
closes #6616
 2016-01-24 07:20:44 +01:00
Steffen van Bergerem
a52c8a2f55 Tell user that the author might ignore them when commenting/liking failed 2016-01-21 21:02:39 +01:00
Dennis Schubert
64a780c831 Prepare 0.5.6.1 hotfix 2016-01-21 20:47:44 +01:00