Benjamin Neff
|
76c64ec1f8
|
Merge branch 'next-minor' into develop
|
2018-08-24 19:49:37 +02:00 |
|
lislis
|
546ef080c5
|
bump fixture_builder to 5.2rc3
closes #7849
|
2018-08-24 19:49:23 +02:00 |
|
Benjamin Neff
|
9b3f90dc90
|
Merge branch 'next-minor' into develop
|
2018-07-20 11:07:18 +02:00 |
|
Benjamin Neff
|
79907b78b9
|
Use podname for web+diaspora:// protocol handler
closes #7839
|
2018-07-20 11:07:11 +02:00 |
|
Benjamin Neff
|
7fef695e29
|
Merge pull request #7834 from SuperTux88/fix-photo-uploader-preview
Fix preview with uploaded photos
|
2018-07-18 01:56:57 +02:00 |
|
Benjamin Neff
|
d06ef4505c
|
Wait for the image actually uploaded and removed again
|
2018-07-17 20:48:37 +02:00 |
|
Benjamin Neff
|
80bc90afa9
|
Fix preview with uploaded photos
|
2018-07-17 20:48:37 +02:00 |
|
Benjamin Neff
|
e5687dd7e0
|
Merge branch 'next-minor' into develop
|
2018-07-17 01:25:53 +02:00 |
|
Senya
|
2be60eab1b
|
Update archive-format.json
/ was missing in the profile entity $ref
closes #7835
|
2018-07-17 01:23:56 +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 |
|
Dennis Schubert
|
f8a4a2c510
|
Gracefully ignore exceptions when trying to register the ProtocolHandler
|
2018-07-13 10:18:48 +02:00 |
|
Dennis Schubert
|
8709c45d30
|
Move the protocol handler into a proper helper module
Previous file history in 80dfdcd6af, couldn't keep it.
|
2018-07-13 10:18:48 +02:00 |
|
Dennis Schubert
|
4430f9e887
|
Add VSCode-related files to the .gitignore
|
2018-07-13 10:17:44 +02:00 |
|
Benjamin Neff
|
ea15403d57
|
Merge pull request #7655 from Flaburgan/6721-fix-upload-progress-bar
Fix multiple photos upload progress bar
|
2018-07-11 01:37:02 +02:00 |
|
Benjamin Neff
|
dcbdb69e22
|
Merge branch 'next-minor' into develop
|
2018-07-11 01:35:50 +02:00 |
|
cmrd Senya
|
a7cc0645e0
|
Cuke for web+diaspora:// link handler
closes #7826
|
2018-07-11 01:28:53 +02:00 |
|
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 |
|