Steffen van Bergerem
|
74fff52e51
|
Fix message modal on profile page
closes #7137
fixes #7136
|
2016-10-26 00:51:41 +02:00 |
|
Steffen van Bergerem
|
9a09515955
|
Merge branch 'next-minor' into develop
|
2016-10-24 00:25:35 +02:00 |
|
Benjamin Neff
|
ac08e9351b
|
Hide "Follow #tag" button on tag page if not logged in
closes #7155
|
2016-10-24 00:25:27 +02:00 |
|
Steffen van Bergerem
|
0b4215e961
|
Merge branch 'next-minor' into develop
|
2016-10-23 23:03:38 +02:00 |
|
Benjamin Neff
|
1f05728033
|
Remove sinatra dependency
Not needed anymore with sidekiq 4.2
closes #7153
|
2016-10-23 23:03:27 +02:00 |
|
Benjamin Neff
|
7e3a8b8c91
|
Merge branch 'next-minor' into develop
|
2016-10-18 23:30:42 +02:00 |
|
Steffen van Bergerem
|
52bb442ddd
|
Bump will_paginate
closes #7149
|
2016-10-18 23:30:30 +02:00 |
|
Steffen van Bergerem
|
88c4d1a519
|
Bump uglifier
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
1729aac5d2
|
Bump spring
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
dd1d079673
|
Bump sidekiq-cron
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
1bd60ec39c
|
Bump sidekiq
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
c79b862490
|
Bump rspec-rails
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
bcc260664d
|
Bump responders
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
5920f8f190
|
Bump markdown-it-sanitizer
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
e969dcd8af
|
Bump markdown-it
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
885ebec5d6
|
Bump highlightjs
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
f4b02dc644
|
Bump pronto
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
42f1bf2c2d
|
Bump poltergeist
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
ec564fbee1
|
Bump pg
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
378a039860
|
Bump nokogiri
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
de64a2e709
|
Bump addressable and json-schema
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
9d1a093990
|
Bump jquery
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
25020c2493
|
Bump jasmine
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
29bd25f94a
|
Bump hamlit
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
f74a51e29c
|
Bump haml_lint
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
6ce117b915
|
Bump fuubar
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
fcb9f0b34d
|
Bump cucumber-rails
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
1b043c35cc
|
Bump capybara
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
01b629f865
|
Bump autoprefixer-rails
|
2016-10-18 23:30:20 +02:00 |
|
Steffen van Bergerem
|
892d2542e6
|
Merge branch 'next-minor' into develop
|
2016-10-18 15:37:37 +02:00 |
|
Augier
|
8c90e5ac46
|
Search suggestion can be opened in a new tab + displays contact's hovercard
closes #7134
|
2016-10-18 15:37:23 +02:00 |
|
Steffen van Bergerem
|
7618b33528
|
Merge branch 'next-minor' into develop
|
2016-10-18 15:05:37 +02:00 |
|
Benjamin Neff
|
0559932f5d
|
rename css classes for scss-lint
closes #7148
|
2016-10-18 15:05:28 +02:00 |
|
Benjamin Neff
|
4112192d95
|
fix avatar size on privacy page for ignored people
|
2016-10-18 15:04:46 +02:00 |
|
Steffen van Bergerem
|
b40108e0c2
|
Merge branch 'next-minor' into develop
|
2016-10-17 22:48:01 +02:00 |
|
Muhannes
|
c5b133d3e8
|
added mobile buttons for streams
Fixed sizes for drawer buttons
Added buttons for stream and public stream in mobile drawer
closes #7144
|
2016-10-17 22:47:57 +02:00 |
|
Dennis Schubert
|
563e62cbcb
|
Merge branch 'next-minor' into develop
|
2016-10-01 10:24:22 +02:00 |
|
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 |
|