Dennis Schubert
|
1e6e20bbfe
|
Merge branch 'next-minor' into develop
|
2016-10-27 02:25:03 +02:00 |
|
Steffen van Bergerem
|
f90812671c
|
Show error messages from server when aspect membership changes fail
closes #7132
|
2016-10-27 02:24:58 +02:00 |
|
Benjamin Neff
|
2c0a2db848
|
Merge branch 'next-minor' into develop
|
2016-10-26 02:50:00 +02:00 |
|
hilkoc
|
b7791e6c9d
|
Add user setting for default post visibility
fixes #4319
closes #7118
|
2016-10-26 02:48:11 +02:00 |
|
Benjamin Neff
|
126d5f8f02
|
Merge branch 'next-minor' into develop
|
2016-10-26 00:52:02 +02:00 |
|
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
|
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 |
|
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 |
|
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 |
|