Dennis Schubert
|
0c78fcaae7
|
Merge branch 'next-minor' into develop
|
2016-11-06 02:34:16 +01:00 |
|
Benjamin Neff
|
08282cea01
|
Add dark theme
Also renamed "Original Dark" to "Original Gray", because it isn't "dark".
closes #7152
|
2016-11-06 02:34:11 +01:00 |
|
Benjamin Neff
|
0b3f10aef2
|
Merge branch 'next-minor' into develop
|
2016-11-03 22:50:08 +01:00 |
|
Steffen van Bergerem
|
a73e1baaed
|
Show spinner when loading comments
closes #7170
|
2016-11-03 22:50:03 +01:00 |
|
Steffen van Bergerem
|
951149dd24
|
Properly format JSON for reshares to hide 'reshare' button on already reshared posts
closes #7169
fixes #4816 and #6594
|
2016-11-03 22:44:12 +01:00 |
|
Benjamin Neff
|
694d4cbc0f
|
Merge branch 'next-minor' into develop
|
2016-11-02 23:03:36 +01:00 |
|
Steffen van Bergerem
|
e3b3da404f
|
Fetch comments, likes and reshares separately
Fixes #7165
closes #7167
|
2016-11-02 23:02:32 +01:00 |
|
Dennis Schubert
|
ad1b2793eb
|
Merge branch 'next-minor' into develop
|
2016-10-30 00:15:20 +02:00 |
|
Dennis Schubert
|
b78ef83c23
|
Merge branch 'release/0.6.1.0' into next-minor
|
2016-10-30 00:15:12 +02:00 |
|
Benjamin Neff
|
e18627f542
|
Suppress deprecation warning: disable csp in report-only mode
|
2016-10-30 00:14:23 +02:00 |
|
Benjamin Neff
|
be3b50295c
|
Use default visibility also for bookmarklet
|
2016-10-30 00:13:03 +02:00 |
|
Dennis Schubert
|
305958ff85
|
Merge branch 'next-minor' into develop
|
2016-10-27 02:30:37 +02:00 |
|
Dennis Schubert
|
368e6d9ef5
|
Start 0.6.2.0 cycle
[ci skip]
|
2016-10-27 02:29:14 +02:00 |
|
Dennis Schubert
|
75aaf869c5
|
Merge branch 'next-minor' into develop
|
2016-10-27 02:26:15 +02:00 |
|
Benjamin Neff
|
0dd98a5c13
|
Bump diaspora_federation
closes #7145
|
2016-10-27 02:26:11 +02:00 |
|
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 |
|