nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
18360 commits 4 branches 0 tags 121 MiB
Commit graph

18360 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Steffen van Bergerem
35aa0badc5
Refactor stream shortcuts 
closes #7127
 2016-09-30 01:44:24 +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
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
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
Benjamin Neff
20cdbe262e
Link directly to the comment from notification mails 
closes #7124
 2016-09-25 23:07:53 +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
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
Benjamin Neff
89a6379edd
Cleanup unused variables from color themes 
closes #7121
 2016-09-25 03:26:22 +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
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
Steffen van Bergerem
709547860a
Refactor SPV post interactions 
closes #7089
 2016-09-25 03:07:02 +02:00
Benjamin Neff
0e5141dd67
Fix mapbox API URL 
closes #7066
 2016-09-25 02:58:56 +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
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
Benjamin Neff
fe071aa2a2
Deliver to each recipient only once 
closes #7071
 2016-09-20 04:25:04 +02:00
Benjamin Neff
3f2586bc6f
Create share visibilities for photos attached to a private post 
Also fixed the "fix public photos"-migration, because it didn't work
with migration-models :/

fixes #6177
 2016-09-20 04:24:37 +02:00
Dennis Schubert
78083afe38
Undo accidential dev->next-minor merge 
Turns out there is a difference between hg and git and I should not
switch that often.
 2016-09-20 02:04:04 +02:00
Dennis Schubert
f6e5fa1d13
Merge branch 'svbergerem-fix-bundler-require' into next-minor 2016-09-20 01:47:12 +02:00
Dennis Schubert
bc9cf77e8d
Merge branch 'master' into next-minor 2016-09-20 01:46:45 +02:00
Dennis Schubert
5521937293
Merge branch 'hotfix/0.6.0.1' 2016-09-20 01:45:18 +02:00
Steffen van Bergerem
f6870c1c4d
Require installed optional groups with Bundler 2016-09-20 01:42:59 +02:00
Dennis Schubert
c39a661861
Init 0.6.0.1 hotfix 2016-09-20 01:40:40 +02:00
Steffen van Bergerem
327cabe6fe Add number of unreviewed reports to admin dashboard and admin sidebar 
closes #7109
 2016-09-18 22:48:05 +02:00
Steffen van Bergerem
c0b9d125fd Use translation for NodeInfo services 
closes #7102
 2016-09-18 22:44:48 +02:00
Lance Gilbert
a9d77c6b1b Enable setting BOSH access protocol via chat configuration 
closes #7100
 2016-09-18 22:31:11 +02:00
Benjamin Neff
8ee92e34aa
Fix duplicate flash message on mobile profile edit 
closes #7107
 2016-09-18 13:44:37 +02:00
Benjamin Neff
5837919946
Fix link to comment on report-page 
closes #7105
 2016-09-18 13:41:44 +02:00
Lukas Matt
9c93691b8a
bump diaspora_jsxc to v0.1.5-develop.7 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>

closes #7095
 2016-09-18 13:35:45 +02:00
Steffen van Bergerem
dc1bc75303 Fix moving publisher on first click after page load 
closes #7094

fixes #7093
 2016-09-13 01:02:39 +02:00
Steffen van Bergerem
2c41485a61 Add charset to error pages 
closes #7092
 2016-09-13 01:01:08 +02:00
Steffen van Bergerem
2139f4b4c2 Use div instead of span for loader 
closes #7091
 2016-09-13 01:00:04 +02:00
Steffen van Bergerem
a3fd949df7
Revert "Use bundler 1.12.5 on travis" 
This reverts commit 5fcc239d7c.
 2016-09-12 10:51:07 +02:00
Steffen van Bergerem
56aec9a978
Require installed optional groups with Bundler 2016-09-12 10:48:46 +02:00
Benjamin Neff
960f39b6ff Merge branch 'next-minor' into develop 2016-09-12 00:47:23 +02:00
Steffen van Bergerem
12e9e551d9 Remove blueimp gallery heading 
closes #7082
 2016-09-12 00:47:18 +02:00
Benjamin Neff
838982e92c Merge branch 'next-minor' into develop 2016-09-12 00:39:40 +02:00
Steffen van Bergerem
16af93f8a2 Prevent overflow of interaction avatars in the single post view 
closes #7070
 2016-09-12 00:39:28 +02:00
Benjamin Neff
5fd7cb2442 Merge branch 'next-minor' into develop 2016-09-12 00:34:50 +02:00