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
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
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
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
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
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
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
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
d1ce590269
Merge branch 'next-minor' into develop
2016-09-20 04:25:10 +02:00
Benjamin Neff
fe071aa2a2
Deliver to each recipient only once
...
closes #7071
2016-09-20 04:25:04 +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
Steffen van Bergerem
f6870c1c4d
Require installed optional groups with Bundler
2016-09-20 01:42:59 +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
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
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
b3b4ccd553
Merge branch 'next-minor' into develop
2016-09-11 23:06:27 +02:00
Steffen van Bergerem
4036a572af
Remove whitespaces next to like link in stream
...
closes #7088
2016-09-11 23:06:21 +02:00
Steffen van Bergerem
eb0f948af5
Merge branch 'next-minor' into develop
2016-09-11 01:55:34 +02:00
Benjamin Neff
a5f538b9ae
Load jquery in the head on mobile
...
Some pages need jquery in the head and instead of loading it twice on
these pages, it is better and easier to load it in the head on all
pages. It should be in the cache after the first load anyway.
closes #7086
2016-09-11 01:55:25 +02:00
Benjamin Neff
4bf1ca6616
Merge branch 'next-minor' into develop
2016-09-11 00:21:28 +02:00
Steffen van Bergerem
546f909658
Fix 500 in html requests for post interactions
...
closes #7085
2016-09-11 00:21:13 +02:00
Steffen van Bergerem
580a068abf
Merge branch 'next-minor' into develop
2016-09-10 15:03:49 +02:00
Flaburgan
f0e70a3c6c
Fix wrong aria label
...
closes #7068
2016-09-10 15:03:39 +02:00
Steffen van Bergerem
3a58c233f4
Merge branch 'next-minor' into develop
2016-09-09 00:54:00 +02:00
cmrd Senya
ad596d8df1
Fix tags URLs in hovercards
...
fixes #7074
closes #7075
2016-09-09 00:53:21 +02:00
Dennis Schubert
99d8ca8414
Merge branch 'next-minor' into develop
2016-09-06 06:03:11 +02:00
Steffen van Bergerem
c6858d62a3
Add missing sidebar background in contacts tab
...
closes #7064
2016-09-06 06:03:06 +02:00
