Commit graph

18377 commits

Author SHA1 Message Date
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
Steffen van Bergerem
521468986f Remove remotipart gem and remotipart photo uploads
closes #7076
2016-09-12 00:34:44 +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
e54077c856 Remove photo_backdrop factories 2016-09-11 00:18:39 +02:00
Benjamin Neff
0354b9b562 Merge branch 'next-minor' into develop 2016-09-10 20:45:49 +02:00
Steffen van Bergerem
5fcc239d7c Use bundler 1.12.5 on travis
closes #7084
2016-09-10 20:45:40 +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
Flaburgan
faf450e57d
Don't use divs inside h3 2016-09-10 15:00:50 +02:00
Flaburgan
2b6bb549c2
autocapitalize: off is deprecated since iOS 5 2016-09-10 15:00:50 +02:00
Flaburgan
abb51abbc3
Remove old charset spec 2016-09-10 15:00:50 +02:00
Dennis Schubert
9c1526cbda
Merge branch 'next-minor' into develop 2016-09-09 01:10:22 +02:00
Steffen van Bergerem
1e2ae69bcd
Add missing sidebar background in contacts tab
closes #7064
2016-09-09 01:08:14 +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
Dennis Schubert
09aef2f145
Merge branch 'next-minor' into develop 2016-09-06 05:08:09 +02:00
Steffen van Bergerem
e27af6ee1a
Redirect logged in users to inviters page when following an invitation link
closes #7061
2016-09-06 05:08:04 +02:00
Steffen van Bergerem
16fc0ec015
Merge branch 'next-minor' into develop 2016-09-05 22:44:57 +02:00
Benjamin Neff
c5ebea5bda
Fix randomly failing interacted_at spec
also remove some unnecessary Timecop.return

closes #7060
2016-09-05 22:44:52 +02:00
Dennis Schubert
a53354edc2
Merge branch 'next-minor' into develop 2016-09-04 21:40:31 +02:00
Benjamin Neff
50e7314535
Cleanup invalid unconfirmed emails
Also remove confirm_email_token when unconfirmed_email is removed.

Fixes #7048

closes #7051
2016-09-04 21:40:27 +02:00
Benjamin Neff
a85c8e75f2 Merge branch 'next-minor' into develop 2016-09-04 03:55:17 +02:00
Steffen van Bergerem
4d51c02432 Add OpenGraph video support
closes #7043
2016-09-04 03:55:09 +02:00
Dennis Schubert
8a9ed52fe4
Merge branch 'next-minor' into develop 2016-09-04 03:37:23 +02:00
Dennis Schubert
0514545fba
Pin diaspora-prosody-config version 2016-09-04 03:36:58 +02:00
Dennis Schubert
948d634a43
Merge branch 'next-minor' into develop 2016-09-04 03:33:08 +02:00
Lukas Matt
19b21b07a4
bump diaspora-prosody-config to v0.0.7
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>

closes #7029
2016-09-04 03:33:03 +02:00