cmrd Senya
80dfdcd6af
Add web+diaspora:// links handler installation
2018-07-11 01:26:43 +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
cmrd Senya
2e0b382699
Use 'post' prefix for status message route helpers
...
This is required to make url_for(StatusMessage.new) work
2018-07-11 01:24:28 +02:00
flaburgan
af02d01d41
Fix progress when uploading multiple photo at the same time
2018-07-09 17:48:30 +02:00
Benjamin Neff
9ff1646cbb
Merge branch 'next-minor' into develop
2018-06-30 23:27:39 +02:00
Benjamin Neff
ac868c9c06
Get processor count with ruby (on linux and mac)
...
closes #7830
2018-06-30 23:27:32 +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
b94ef57bbc
Merge branch 'next-minor' into develop
2018-06-20 01:56:25 +02:00
Benjamin Neff
67d6d2ff25
Prepare 0.7.7.0 cycle
2018-06-20 01:38:17 +02:00
Benjamin Neff
f9a59f2ff0
Merge branch 'next-minor' into develop
2018-06-20 00:50:34 +02:00
Benjamin Neff
23fcac6550
Bump sprockets
...
Fixes CVE-2018-3760
closes #7829
2018-06-20 00:50:24 +02:00
HankG
5a8bdc1e71
Facebook plugin always appends (via D* post URL) to cross-posts
...
fixes #7770
closes #7774
2018-06-20 00:47:12 +02:00
Benjamin Neff
0b9ba559c7
Merge branch 'next-minor' into develop
2018-06-18 02:48:47 +02:00
flaburgan
3d83fbdbe5
Link to the pod in the emails footer
...
closes #7814
2018-06-18 02:47:56 +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ß
88503539ec
migrate hy users to hye
...
closes #7822
2018-06-16 21:14:43 +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
Radomír Bosák
cfa7724d73
Escape asterisks in README
...
Unescaped asterisks can cause markdown text to be misinterpreted. Also
syntax highlighters (e.g. in sublime text) freak out.
References: [markdown
spec](https://daringfireball.net/projects/markdown/syntax#em )
closes #7821
2018-06-16 04:32:38 +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
fa615533f6
Bump kostya-sigar
...
Fixes compatibility with newer glibc
closes #7828
2018-06-16 01:19:36 +02:00
Benjamin Neff
f863cf08a0
Merge branch 'next-minor' into develop
2018-05-16 19:10:09 +02:00
Benjamin Neff
ebaa209120
Remove gemnasium badge
...
See: https://docs.gitlab.com/ee/user/project/import/gemnasium.html
2018-05-16 19:09:34 +02:00
Benjamin Neff
0cb212e6cb
Merge branch 'next-minor' into develop
2018-05-16 00:54:46 +02:00
cmrd Senya
a3378ae744
Account merging: handle duplicates for TagFollowing
...
I missed it in #7803
closes #7807
2018-05-16 00:54:16 +02:00
Benjamin Neff
2a60cb30a1
Merge branch 'next-minor' into develop
2018-05-03 21:33:10 +02:00
cmrd Senya
cb294fd3f4
Add completed_at to account_migrations
...
Use completed_at datetime field as an indication of a performed migration
closes #7805
2018-05-03 21:31:29 +02:00
cmrd Senya
e9f6dbdffd
Add unique index to poll participations on author_id and poll_id
...
Previously we had only a Rails validation which ensured poll participation
uniqueness but this adds uniqueness control to the database level, so that
uniqueness is guaranteed even when changing data with avoiding Rails
validations.
closes #7798
2018-05-03 21:28:38 +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
cmrd Senya
8680b24a2e
Account merging support
...
Adds support for merging accounts with account migration by eliminating
duplicate data in favor of the target user's data.
closes #7803
2018-04-30 22:06:34 +02:00
Dennis Schubert
360ea20367
Merge branch 'next-minor' into develop
2018-04-23 20:37:03 +02:00
Dennis Schubert
8d6c891ecb
Prepare 0.7.6.0 cycle
2018-04-23 20:35:18 +02:00
Dennis Schubert
74bac8c495
Merge branch 'next-minor' into develop
2018-04-23 20:33:20 +02:00
HankG
211e5cd1bc
Bugfix 7714 twitter char overflow
...
closes #7791
2018-04-23 20:33:07 +02:00
Benjamin Neff
c061425022
Add changelog entry for #7788 [ci skip]
2018-04-16 01:32:41 +02:00
Benjamin Neff
c643743df0
Merge pull request #7788 from SuperTux88/remove-mention-backport
...
Remove backporting of mention syntax
2018-04-16 01:27:47 +02:00
Benjamin Neff
d5f5e1991b
Merge branch 'next-minor' into develop
2018-04-16 01:26:56 +02:00
