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
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
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
b1eda420a3
Merge branch 'next-minor' into develop
2016-09-20 02:06:05 +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
c3c5583d3e
Merge branch 'next-minor' into develop
2016-09-20 01:47:32 +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
Benjamin Neff
9daee43aa8
Merge branch 'next-minor' into develop
2016-09-18 22:48:10 +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
Benjamin Neff
e88fdf8d60
Merge branch 'next-minor' into develop
2016-09-18 22:44:53 +02:00
Steffen van Bergerem
c0b9d125fd
Use translation for NodeInfo services
...
closes #7102
2016-09-18 22:44:48 +02:00
Benjamin Neff
95167528a2
Merge branch 'next-minor' into develop
2016-09-18 22:31:18 +02:00
Lance Gilbert
a9d77c6b1b
Enable setting BOSH access protocol via chat configuration
...
closes #7100
2016-09-18 22:31:11 +02:00
Steffen van Bergerem
b629f5fe32
Merge branch 'next-minor' into develop
2016-09-18 13:44:44 +02:00
Benjamin Neff
8ee92e34aa
Fix duplicate flash message on mobile profile edit
...
closes #7107
2016-09-18 13:44:37 +02:00
Steffen van Bergerem
73d12bf344
Merge branch 'next-minor' into develop
2016-09-18 13:41:53 +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
07883a73ba
Merge branch 'next-minor' into develop
2016-09-18 13:35:53 +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
Benjamin Neff
1fdc17d96c
Merge branch 'next-minor' into develop
2016-09-13 01:02:57 +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
Benjamin Neff
58642de8cb
Merge branch 'next-minor' into develop
2016-09-13 01:01:12 +02:00
Steffen van Bergerem
2c41485a61
Add charset to error pages
...
closes #7092
2016-09-13 01:01:08 +02:00
Benjamin Neff
36b2dff164
Merge branch 'next-minor' into develop
2016-09-13 01:00:13 +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
