cmrd Senya
|
cdcf2d747e
|
Override forgery settings in controllers
ClientsController and TokenEndpointController are called from the outside,
so CSRF verification prevents them from normal operation.
closes #7062
|
2016-10-01 10:24:15 +02:00 |
|
Steffen van Bergerem
|
fa4f7ff2d8
|
Merge branch 'next-minor' into develop
|
2016-10-01 02:37:02 +02:00 |
|
Benjamin Neff
|
1c1c9d6794
|
Link to diaspora* admin dashboard
closes #7130
|
2016-10-01 02:36:55 +02:00 |
|
Benjamin Neff
|
fc3627d567
|
Merge branch 'next-minor' into develop
|
2016-10-01 02:29:11 +02:00 |
|
Steffen van Bergerem
|
471af747b1
|
Remove extra padding from comment form in the stream
closes #7133
|
2016-10-01 02:27:44 +02:00 |
|
Steffen van Bergerem
|
2a31c2a6db
|
Unify new conversation margins
|
2016-10-01 02:27:19 +02:00 |
|
Dennis Schubert
|
c41fd52f1d
|
Merge branch 'next-minor' into develop
|
2016-09-30 02:11:36 +02:00 |
|
Benjamin Neff
|
ec8a49b338
|
Add settings for CSP to diaspora.yml
closes #7128
|
2016-09-30 02:11:32 +02:00 |
|
Benjamin Neff
|
caef670934
|
Configure CSP header for services from diaspora.yml
|
2016-09-30 02:10:37 +02:00 |
|
Benjamin Neff
|
edf6602099
|
Add frame-src but don't spam the log with DEPRECATION warnings.
This is an ugly hack, and it should be reverted once we stop supporting
old browsers.
|
2016-09-30 02:10:37 +02:00 |
|
Benjamin Neff
|
6ec0fd4b9f
|
Add nonce to javascript tags
|
2016-09-30 02:10:37 +02:00 |
|
Benjamin Neff
|
4da1c78bb7
|
Add secure_header gem to add some security related headers
basic config for Content Security Policies
|
2016-09-30 02:10:37 +02:00 |
|
Dennis Schubert
|
55b8c92809
|
Merge branch 'next-minor' into develop
|
2016-09-30 01:44:28 +02:00 |
|
Steffen van Bergerem
|
35aa0badc5
|
Refactor stream shortcuts
closes #7127
|
2016-09-30 01:44:24 +02:00 |
|
Dennis Schubert
|
bb7928af55
|
Merge branch 'next-minor' into develop
|
2016-09-30 01:43:30 +02:00 |
|
Benjamin Neff
|
0a264c1fe0
|
Set redis url for sidekiq cleanup migration task
closes #7125
|
2016-09-30 01:43:26 +02:00 |
|
Steffen van Bergerem
|
e08b775507
|
Merge branch 'next-minor' into develop
|
2016-09-30 00:33:16 +02:00 |
|
Steffen van Bergerem
|
2a697c5d1f
|
Remove inbox.js from precompiled assets
closes #7108
|
2016-09-30 00:33:12 +02:00 |
|
Steffen van Bergerem
|
b1a76cac86
|
Fix spelling in conversations inbox view spec
|
2016-09-30 00:32:46 +02:00 |
|
Augier
|
e424896822
|
Fully port conversations to Backbone and drop inbox.js
|
2016-09-30 00:32:46 +02:00 |
|
Steffen van Bergerem
|
3437c4d5cb
|
Merge branch 'next-minor' into develop
|
2016-09-28 22:00:10 +02:00 |
|
Benjamin Neff
|
caf46fdcb9
|
Move initialization of mobile profile edit functions to file
closes #7113
|
2016-09-28 22:00:06 +02:00 |
|
Benjamin Neff
|
be33b425ba
|
remove unused precompiled JS files
|
2016-09-28 21:59:08 +02:00 |
|
Benjamin Neff
|
fccabf9983
|
Extract mobile bookmarklet JS to file
|
2016-09-28 21:59:08 +02:00 |
|
Benjamin Neff
|
459ebffa6e
|
Start background search with gon
|
2016-09-28 21:59:08 +02:00 |
|
Benjamin Neff
|
b8c76a3317
|
Trigger getting started with backbone
|
2016-09-28 21:59:08 +02:00 |
|
Benjamin Neff
|
14304f3620
|
Extract profile photo uploader to file
|
2016-09-28 21:59:08 +02:00 |
|
Benjamin Neff
|
07a4925f3b
|
Extract tags autocompletion JS to file
|
2016-09-28 21:59:08 +02:00 |
|
Dennis Schubert
|
795283b581
|
Merge branch 'next-minor' into develop
|
2016-09-25 23:07:57 +02:00 |
|
Benjamin Neff
|
20cdbe262e
|
Link directly to the comment from notification mails
closes #7124
|
2016-09-25 23:07:53 +02:00 |
|
Benjamin Neff
|
aa70b2f6c9
|
Merge branch 'next-minor' into develop
|
2016-09-25 20:15:34 +02:00 |
|
Dennis Schubert
|
dfb5b717b6
|
Add In-Reply-To and References headers to notification mails
closes #7122
|
2016-09-25 20:15:16 +02:00 |
|
Dennis Schubert
|
3186855ffa
|
Merge branch 'next-minor' into develop
|
2016-09-25 07:28:32 +02:00 |
|
Dennis Schubert
|
6ca598e54a
|
Rename GNU-AGPL-3.0 to LICENSE
to have the license displayed in the projects header and inside GitHubs
License API
[ci skip]
|
2016-09-25 07:26:07 +02:00 |
|
Dennis Schubert
|
89bf1aeb4b
|
Merge branch 'next-minor' into develop
|
2016-09-25 03:26:26 +02:00 |
|
Benjamin Neff
|
89a6379edd
|
Cleanup unused variables from color themes
closes #7121
|
2016-09-25 03:26:22 +02:00 |
|
Dennis Schubert
|
67328b9533
|
Merge branch 'next-minor' into develop
|
2016-09-25 03:20:48 +02:00 |
|
Benjamin Neff
|
fe5811bb65
|
Don't federate to pods that are offline for more than two weeks
Also fix a case where offline_since can be nil.
fixes #6220
closes #7120
|
2016-09-25 03:20:41 +02:00 |
|
Dennis Schubert
|
20f93323fa
|
Merge branch 'next-minor' into develop
|
2016-09-25 03:12:35 +02:00 |
|
Augier
|
a37d9d532b
|
Fix some pronto remarks
closes #7119
|
2016-09-25 03:12:31 +02:00 |
|
Augier
|
523f1e848e
|
Replace .stream_element by .stream-element
|
2016-09-25 03:12:28 +02:00 |
|
Dennis Schubert
|
cff9669a03
|
Merge branch 'next-minor' into develop
|
2016-09-25 03:07:08 +02:00 |
|
Steffen van Bergerem
|
709547860a
|
Refactor SPV post interactions
closes #7089
|
2016-09-25 03:07:02 +02:00 |
|
Dennis Schubert
|
5437af74a3
|
Merge branch 'next-minor' into develop
|
2016-09-25 02:59:00 +02:00 |
|
Benjamin Neff
|
0e5141dd67
|
Fix mapbox API URL
closes #7066
|
2016-09-25 02:58:56 +02:00 |
|
Dennis Schubert
|
8a3fd1f3e7
|
Merge branch 'next-minor' into develop
|
2016-09-20 10:21:53 +02:00 |
|
Benjamin Neff
|
b4455aaf25
|
Fix 20160906225138_fix_photos_share_visibilities.rb for postgres
Turns out that postgres can't handle "0" as boolean, but mysql can
handle "false".
closes #7115#pullrequestreview-699342
|
2016-09-20 10:21:49 +02:00 |
|
Dennis Schubert
|
f34bf255d1
|
Merge branch 'next-minor' into develop
|
2016-09-20 04:29:47 +02:00 |
|
Steffen van Bergerem
|
ffb442266f
|
Remove custom typeahead mouse events
closes #7096
|
2016-09-20 04:29:43 +02:00 |
|
Steffen van Bergerem
|
260272cbee
|
Update typeahead
|
2016-09-20 04:29:40 +02:00 |
|