flaburgan
7bdf33e1a8
Move invitation form under the user search in admin
...
Indicates when there is no report to review to avoid a weird empty page
2017-07-05 01:50:16 +02:00
SansPseudoFix
5cb4c6e5df
Refactor, more partials + No version check for mobile
2017-07-05 01:50:16 +02:00
SansPseudoFix
276b640418
Add admin views to mobile, use partials for common code with desktop
2017-07-05 01:50:10 +02:00
Benjamin Neff
d71aa6a54a
Merge branch 'next-minor' into develop
2017-07-03 03:46:54 +02:00
atulonruby
df1139234f
Warn user if he leaves profile editing page #6520
...
closes #7473
closes #6589
2017-07-03 03:45:57 +02:00
Benjamin Neff
a931bee319
Make Participation entity non-relayable
2017-07-03 03:14:42 +02:00
Benjamin Neff
be8a1dfef4
Add tests for ContactRetraction
2017-07-03 03:14:42 +02:00
cmrd Senya
c2b9b8ab54
Use ContactRetraction for stop sharing with someone
2017-07-03 03:14:42 +02:00
Benjamin Neff
e2a40bb643
Send Relayables with parent author when the parent is local
...
Needed for diaspora/diaspora_federation#64
2017-07-03 03:14:42 +02:00
Benjamin Neff
4f9e560ab3
Use RFC 7033 webfinger from diaspora_federation gem
2017-07-03 03:14:41 +02:00
Benjamin Neff
283722a693
Use build_relayable_federation_entity helper for receive specs
2017-07-03 03:14:41 +02:00
Benjamin Neff
3ab674552f
Rename xml_order to signature_order
2017-07-03 03:14:41 +02:00
Benjamin Neff
0f551c7b19
Fix public flag for contact retractions
2017-07-03 03:14:41 +02:00
Benjamin Neff
4244f2a5df
Make Participation entity non-relayable
...
Related to diaspora/diaspora_federation#35
2017-07-03 03:14:41 +02:00
Benjamin Neff
07e9bf8be8
Remove old unused salmon method
2017-07-03 03:14:40 +02:00
Benjamin Neff
246d1ebbdf
Remove legacy post xml
...
This was used for the old post fetching
Related to diaspora/diaspora_federation#31
2017-07-03 03:14:40 +02:00
Benjamin Neff
a6d7dbf1dd
Send MagicEnvelope as body with correct Content-Type in specs
...
Related to diaspora/diaspora_federation#30
2017-07-03 03:14:40 +02:00
Benjamin Neff
381c03cfd7
Remove backward-compatibility for Retractions
2017-07-02 23:56:01 +02:00
Benjamin Neff
b6b0aac969
Send only Retractions
...
Related to diaspora/diaspora_federation#27
2017-07-02 23:56:00 +02:00
Benjamin Neff
e907b3eb18
Send Contact entity for start/stop sharing
...
Related to diaspora/diaspora_federation#32
2017-07-02 23:56:00 +02:00
Benjamin Neff
f6dc809e29
Send new MagicEnvelope and EncryptedMagicEnvelope
...
Related to diaspora/diaspora_federation#30
2017-07-02 23:56:00 +02:00
Benjamin Neff
95def40c55
Make Message entity non-relayable
...
Related to #36
2017-07-02 23:56:00 +02:00
Benjamin Neff
87d0778086
Remove guid and public_key from WebFinger
...
Related to diaspora/diaspora_federation#39
2017-07-02 23:56:00 +02:00
Benjamin Neff
5e2d063c49
Hash from federation entity now contains the correct data-type
2017-07-02 23:56:00 +02:00
Benjamin Neff
189c223224
Fix notification factory
2017-07-02 23:55:59 +02:00
Benjamin Neff
49822a9af7
New namespace for InvalidRootNode
2017-07-02 23:55:59 +02:00
Benjamin Neff
5e3ea249a9
Replace additional_xml_elements with additional_data for relayables
2017-07-02 23:55:59 +02:00
Benjamin Neff
78c7156e72
Replace FactoryGirl with Fabricate for federation factories
2017-07-02 23:55:59 +02:00
Benjamin Neff
d79c2e511b
Bump diaspora_federation
2017-07-02 23:55:01 +02:00
Benjamin Neff
cb50681cea
Merge branch 'next-minor' into develop
2017-06-30 02:13:40 +02:00
Benjamin Neff
0d232f1d1b
Switch PercentLiteralDelimiters to new default
...
Let's change that to the new rubocop default, which is also the
suggestion in the ruby style guide.
See https://github.com/bbatsov/ruby-style-guide#percent-literal-braces
closes #7466
2017-06-30 02:13:31 +02:00
Benjamin Neff
05efe9b8fe
Merge branch 'next-minor' into develop
2017-05-29 03:21:59 +02:00
Benjamin Neff
1751e21a87
Merge branch 'master' into next-minor
2017-05-29 03:21:49 +02:00
Benjamin Neff
7aadadce44
Merge branch 'release/0.6.6.0'
2017-05-29 03:20:38 +02:00
Benjamin Neff
f59055860a
updated 70 locale files [ci skip]
2017-05-29 03:17:45 +02:00
Benjamin Neff
44e10a9172
Merge branch 'next-minor' into develop
2017-05-26 01:51:37 +02:00
Mahonri Gibson
5739f67605
Save email without confirmation when podmail is disabled.
...
fixes #7195
closes #7455
2017-05-26 01:50:55 +02:00
Benjamin Neff
a7093c6f7d
Merge branch 'next-minor' into develop
2017-05-23 00:17:19 +02:00
Benjamin Neff
a6869197d8
Start 0.6.7.0 cycle
...
[ci skip]
2017-05-23 00:15:06 +02:00
Dennis Schubert
01d1bb10ac
Merge branch 'next-minor' into develop
2017-05-21 12:08:16 +02:00
Benjamin Neff
0197cecaf8
Bump nokogiri
...
closes #7458
2017-05-21 12:08:12 +02:00
Dennis Schubert
7c37a62593
Merge branch 'next-minor' into develop
2017-05-21 12:07:14 +02:00
Benjamin Neff
65e8fc4012
Fix comment for environment.sidekiq.retry in diaspora.yml
...
fixes #7456
closes #7457
2017-05-21 12:07:10 +02:00
Dennis Schubert
1e06fd786c
Merge branch 'next-minor' into develop
2017-05-21 12:06:41 +02:00
Benjamin Neff
e177706769
Add admin account username to NodeInfo metadata
...
Fixes #7421
closes #7447
2017-05-21 12:06:35 +02:00
Benjamin Neff
7934c1e969
Add NodeInfo 2.0 support
2017-05-21 12:05:54 +02:00
Dennis Schubert
010c1953f9
Merge branch 'next-minor' into develop
2017-05-21 12:05:22 +02:00
Benjamin Neff
c2eb53e827
Bump rubocop
...
Use old style for Style/PercentLiteralDelimiters for now. Maybe we can
change this in the future, because the ruby style guide suggests to use
`[]` (which is also the new default for rubocop).
closes #7443#
2017-05-21 12:05:17 +02:00
Benjamin Neff
153569e297
Bump pronto and all pronto-runners
...
Also add `require: false` everywhere.
2017-05-21 12:05:13 +02:00
Benjamin Neff
e463397122
Merge branch 'next-minor' into develop
2017-05-16 00:37:06 +02:00
