Dennis Schubert
cd16f29c39
Merge branch 'next-minor' into develop
2018-11-08 05:14:36 +01:00
Benjamin Neff
3c55a425c7
Fix script domain for instagram in CSP header
...
closes #7920
2018-11-08 05:12:55 +01:00
Benjamin Neff
d3bb7ade78
Merge branch 'next-minor' into develop
2018-11-02 01:39:11 +01:00
flaburgan
65e0f90b86
Reword the web handler setting
...
fixes #7838
closes #7909
2018-11-02 01:35:44 +01:00
Dennis Schubert
0133a9f354
updated 17 locale files [ci skip]
2018-10-27 00:13:47 +02:00
Dennis Schubert
a201e3b2c2
updated 17 locale files [ci skip]
2018-10-27 00:12:25 +02:00
Dennis Schubert
53a7508222
Merge branch 'next-minor' into develop
2018-10-15 02:41:57 +02:00
Dennis Schubert
fcbc470b5c
Merge branch 'release/0.7.7.0' into next-minor
2018-10-15 02:41:22 +02:00
Dennis Schubert
af3e2e6d53
updated 33 locale files [ci skip]
2018-10-15 02:40:23 +02:00
Dennis Schubert
a928e40d7f
Merge branch 'next-minor' into develop
2018-10-14 06:03:12 +02:00
Zachary Rabinovich
c4fed4bbcc
Add the ability to assign roles in the admin panel
...
closes #7868
2018-10-14 06:03:06 +02:00
Dennis Schubert
9bab794ea4
Merge branch 'next-minor' into develop
2018-10-08 02:50:36 +02:00
Dennis Schubert
89d9a865b6
Merge branch 'release/0.7.7.0' into next-minor
2018-10-08 02:50:29 +02:00
Benjamin Neff
fc6893d4fc
Remove facebook integration
...
Facebook removed the API and facebook integration is broken now, so lets
remove it.
closes #7874
2018-10-08 02:50:25 +02:00
Dennis Schubert
3cd6f9abbb
Start 0.7.8.0 cycle
...
[ci skip]
2018-10-08 02:42:10 +02:00
Dennis Schubert
3ebe0e56a8
Merge branch 'next-minor' into develop
2018-10-04 04:37:06 +02:00
Luna Gloaming
45b7f0b119
Added quotation marks for postgresql parameters.
...
As a new, novice user, I ran into an issue where my postgresql
password contained special characters. After a brief conversation
with DenSchub on #diaspora, it was noted that while the example
database configuration had quotes added for mysql, but not for
postgresql, and it was suggested this be improved.
closes #7875
2018-10-04 04:36:57 +02:00
Dennis Schubert
24c7e472d4
Merge branch 'next-minor' into develop
2018-09-30 17:59:12 +02:00
Benjamin Neff
b6333e0b1b
Remove reference to statistics.json
...
and mention /statistics and NodeInfo
closes #7867
2018-09-30 17:58:55 +02:00
Dennis Schubert
026e63b961
Merge branch 'next-minor' into develop
2018-09-08 02:25:44 +02:00
Benjamin Neff
49b63693c9
Fix i18n fallbacks
...
Fallbacks are set in config/initializers/locale.rb and this settings
conflicts with the fallbacks set there.
Fixes #7860
closes #7861
2018-09-08 02:25:36 +02:00
Benjamin Neff
1289b3b541
Merge branch 'next-minor' into develop
2018-07-13 10:22:04 +02:00
Dennis Schubert
af500dabbc
Add section in the User's settings to register the protocol handler
...
closes #7833
2018-07-13 10:19:43 +02:00
Benjamin Neff
dcbdb69e22
Merge branch 'next-minor' into develop
2018-07-11 01:35:50 +02:00
cmrd Senya
6f812a5b8f
Add LinksController
...
LinksController redirects requests for provided diaspora:// links to
respective entities urls.
2018-07-11 01:24:28 +02:00
Benjamin Neff
4aa08ddf14
Merge branch 'next-minor' into develop
2018-06-27 02:46:26 +02:00
Benjamin Neff
c2fa0b1eba
Merge branch 'master' into next-minor
2018-06-27 02:46:04 +02:00
Benjamin Neff
2b3bbc1a6c
Merge branch 'release/0.7.6.0'
2018-06-27 02:42:00 +02:00
Benjamin Neff
097754e493
updated 6 locale files [ci skip]
2018-06-27 02:31:52 +02:00
Benjamin Neff
67d6d2ff25
Prepare 0.7.7.0 cycle
2018-06-20 01:38:17 +02:00
Benjamin Neff
299c04a24a
Merge pull request #7781 from SuperTux88/enable-csp-by-default
...
Enable Content-Security-Policy header by default
2018-06-16 21:21:07 +02:00
Benjamin Neff
8983901b1a
Merge branch 'next-minor' into develop
2018-06-16 21:19:41 +02:00
Benjamin Neff
10841b6031
updated 16 locale files [ci skip]
2018-06-16 21:18:15 +02:00
Jonne Haß
fe75602928
update armenian locales
2018-06-16 21:12:13 +02:00
Jonne Haß
fac3c4bbe3
update plural rules
2018-06-16 21:12:13 +02:00
goobertron
d1597c0b23
Update locale_settings.yml with 3 Armenian variants
2018-06-16 21:12:09 +02:00
Benjamin Neff
f3d2a54050
Merge branch 'next-minor' into develop
2018-06-16 04:36:13 +02:00
cmrd Senya
87968284ba
Support fetching StatusMessage by Poll guid
...
When public fetch is requested with Poll guid, return parent
StatusMessage for it, which includes the Poll in its turn.
closes #7815
2018-06-16 04:36:05 +02:00
Benjamin Neff
212da3a2b7
Merge branch 'next-minor' into develop
2018-06-16 01:23:10 +02:00
Alex Tribble
1b03265c2e
Allow fonts to be served from asset host in CSP.
...
Closes #7796
closes #7825
2018-06-16 01:22:22 +02:00
Benjamin Neff
22d1ad995c
Merge branch 'next-minor' into develop
2018-04-30 22:54:33 +02:00
Benjamin Neff
b7cd9d6238
Merge branch 'master' into next-minor
2018-04-30 22:54:03 +02:00
Benjamin Neff
42ceb8b3e3
Merge branch 'release/0.7.5.0'
2018-04-30 22:51:23 +02:00
Benjamin Neff
6a3d9ede52
Make ja-KS avaliable
2018-04-30 22:18:55 +02:00
Benjamin Neff
f5350e2df6
updated 77 locale files [ci skip]
2018-04-30 22:10:06 +02:00
Dennis Schubert
8d6c891ecb
Prepare 0.7.6.0 cycle
2018-04-23 20:35:18 +02:00
Benjamin Neff
d5f5e1991b
Merge branch 'next-minor' into develop
2018-04-16 01:26:56 +02:00
Dennis Schubert
6918dbc761
Randomize start times of daily Sidekiq-Cron jobs
...
closes #7787
2018-04-16 01:26:48 +02:00
Benjamin Neff
c1ebc4d338
Merge branch 'next-minor' into develop
2018-04-12 02:49:11 +02:00
Benjamin Neff
0e526f9221
Bump jasmine
...
Disable random tests for now, many tests fail when this is true (which
is now default)
2018-04-12 02:41:56 +02:00
