Benjamin Neff
|
ec2c4a8564
|
Merge branch 'next-minor' into develop
|
2017-02-18 23:00:59 +01:00 |
|
Steffen van Bergerem
|
e3c9e9c9f1
|
Improve comment service spec for limited post the user can't see
closes #7337
|
2017-02-18 23:00:49 +01:00 |
|
Benjamin Neff
|
f9cf844602
|
Merge pull request #7280 from svbergerem/remove-chartbeat-and-mixpanel
Remove chartbeat and mixpanel support
|
2017-02-17 22:22:30 +01:00 |
|
Benjamin Neff
|
f1f1d09944
|
Merge pull request #7302 from svbergerem/simplify-mentions-publisher
Simplify mentions in the publisher
|
2017-02-15 03:15:01 +01:00 |
|
Steffen van Bergerem
|
810e43787c
|
Merge branch 'next-minor' into develop
|
2017-02-14 10:37:05 +01:00 |
|
Benjamin Neff
|
d68ad916c8
|
Remove whitespace from author link
closes #7330
|
2017-02-14 10:36:58 +01:00 |
|
Benjamin Neff
|
8a409c815c
|
Merge branch 'next-minor' into develop
|
2017-02-14 00:30:53 +01:00 |
|
Steffen van Bergerem
|
5f8c838750
|
Change color of author-name on hover
closes #7326
|
2017-02-14 00:30:44 +01:00 |
|
Benjamin Neff
|
d984178685
|
Merge pull request #7327 from svbergerem/display-mentions-in-comment
Render mentions as links in comments
|
2017-02-13 23:58:28 +01:00 |
|
Steffen van Bergerem
|
339c25f333
|
Merge pull request #7324 from SuperTux88/at-before-mention-links
Display @ before mentions
|
2017-02-13 22:06:50 +01:00 |
|
Steffen van Bergerem
|
99351bd152
|
Merge branch 'next-minor' into develop
|
2017-02-13 14:21:29 +01:00 |
|
Benjamin Neff
|
e92431ba88
|
Remove some unused color-theme overrides
After #7318 $link-color is used by default, no need to override anymore.
closes #7325
|
2017-02-13 14:21:20 +01:00 |
|
Benjamin Neff
|
2f9a032b38
|
Merge branch 'next-minor' into develop
|
2017-02-12 21:01:36 +01:00 |
|
Steffen van Bergerem
|
9558e747e4
|
Increase time to wait before showing the hovercard
closes #7319
|
2017-02-12 21:01:21 +01:00 |
|
Benjamin Neff
|
cdb220be8d
|
Merge branch 'next-minor' into develop
|
2017-02-11 19:37:30 +01:00 |
|
Steffen van Bergerem
|
dc8d66520b
|
Use $link-color for text and $brand-primary for backgrounds/buttons
closes #7318
|
2017-02-11 19:37:07 +01:00 |
|
Steffen van Bergerem
|
f1510ba2d6
|
Merge branch 'next-minor' into develop
|
2017-02-08 12:58:27 +01:00 |
|
Benjamin Neff
|
d9a1297271
|
Refactor PublisherHelper and move publisher_open? method
closes #7311
|
2017-02-08 12:58:13 +01:00 |
|
Dennis Schubert
|
63077bfeaf
|
Merge branch 'next-minor' into develop
|
2017-02-05 10:34:48 +01:00 |
|
Steffen van Bergerem
|
690bbd9db3
|
Link to community guidelines from left navbar
closes #7298
|
2017-02-05 10:34:44 +01:00 |
|
Dennis Schubert
|
29e712dfc8
|
Merge pull request #7305 from SuperTux88/improve-mention-syntax
Improve mention syntax
|
2017-02-05 10:30:06 +01:00 |
|
Benjamin Neff
|
e10771c707
|
Merge pull request #7300 from SuperTux88/new-mention-syntax
New mention syntax - backend changes
|
2017-01-29 07:02:35 +01:00 |
|
Benjamin Neff
|
a025a23c71
|
Merge branch 'next-minor' into develop
|
2017-01-23 02:43:12 +01:00 |
|
Benjamin Neff
|
c130b78117
|
Merge branch 'master' into next-minor
|
2017-01-23 02:42:53 +01:00 |
|
Benjamin Neff
|
3d992160c3
|
Enable locales: de-CH, gd, and oc
|
2017-01-23 02:35:14 +01:00 |
|
Benjamin Neff
|
af00d7c5c0
|
Merge branch 'next-minor' into develop
|
2017-01-22 23:30:42 +01:00 |
|
flaburgan
|
1028632ac1
|
Add Liberapay button in the donate section
closes #7290
|
2017-01-22 23:29:57 +01:00 |
|
Benjamin Neff
|
a0bfe6ffbe
|
Merge branch 'next-minor' into develop
|
2017-01-16 01:17:35 +01:00 |
|
Steffen van Bergerem
|
b508b9f6ef
|
Update database config comments
closes #7282
|
2017-01-16 01:17:27 +01:00 |
|
Benjamin Neff
|
7b7fbeffdc
|
Merge branch 'next-minor' into develop
|
2017-01-15 23:45:56 +01:00 |
|
spixi
|
fa0bd14dfb
|
Fix script/server when bin/ is not in PATH
This fixes an issue, when the bin/ directory of diaspora is not in the PATH variable
closes #7281
|
2017-01-15 23:27:27 +01:00 |
|
Benjamin Neff
|
5d52c298ad
|
Merge branch 'next-minor' into develop
|
2017-01-15 05:07:07 +01:00 |
|
Benjamin Neff
|
66367cccd8
|
Start 0.6.4.0 cycle
|
2017-01-15 05:05:24 +01:00 |
|
Steffen van Bergerem
|
eb8d9809ff
|
Merge branch 'next-minor' into develop
|
2017-01-15 04:04:31 +01:00 |
|
SansPseudoFix
|
0f60b9fb94
|
Switch reason and message
unify
rename and show full post on reports
Fix XSS issue
Unification
Style
Fix pronto
closes #7180
|
2017-01-15 04:04:18 +01:00 |
|
Benjamin Neff
|
03f9147589
|
Merge branch 'next-minor' into develop
|
2017-01-15 02:19:10 +01:00 |
|
Steffen van Bergerem
|
d0e70ccd6a
|
Use new ajax error handling for like, unlike and comment failures
closes #7227
|
2017-01-15 02:19:02 +01:00 |
|
Dennis Schubert
|
00193a8866
|
Merge branch 'next-minor' into develop
|
2017-01-15 00:11:18 +01:00 |
|
Benjamin Neff
|
f671bebd04
|
Fix background on mobile photo upload with dark theme
closes #7278
|
2017-01-15 00:11:07 +01:00 |
|
Benjamin Neff
|
66e3cdb07e
|
Merge branch 'next-minor' into develop
|
2017-01-14 03:22:36 +01:00 |
|
Steffen van Bergerem
|
a290c432d8
|
Fix link to post on mobile photo page
closes #7274
|
2017-01-14 03:21:37 +01:00 |
|
Benjamin Neff
|
479328d0e3
|
Merge branch 'next-minor' into develop
|
2017-01-13 02:49:18 +01:00 |
|
Steffen van Bergerem
|
6e7910b037
|
Deduplicate notification dropdown view
closes #7270
|
2017-01-13 02:49:08 +01:00 |
|
Benjamin Neff
|
ac136030c6
|
Merge branch 'next-minor' into develop
|
2017-01-11 02:43:41 +01:00 |
|
Steffen van Bergerem
|
b58226ba9a
|
Load comments in mobile view when clicking comment button
closes #7207
|
2017-01-11 02:43:15 +01:00 |
|
Benjamin Neff
|
f01480a14c
|
Merge branch 'next-minor' into develop
|
2017-01-10 23:45:08 +01:00 |
|
Steffen van Bergerem
|
5efb4a912e
|
Prevent scroll to top when clicking 'mark all as read' in the notification dropdown
Fixes #7252
closes #7253
|
2017-01-10 23:41:35 +01:00 |
|
Steffen van Bergerem
|
fb06d03f49
|
Close modals at the end of each jasmine spec
closes #7246
|
2017-01-10 23:32:27 +01:00 |
|
Steffen van Bergerem
|
c164dac7a4
|
Merge branch 'next-minor' into develop
|
2017-01-07 18:32:15 +01:00 |
|
Frédéric Bolvin
|
7cc4b46d7e
|
Replaced fileuploader-custom with FineUploader
closes #7083
|
2017-01-07 18:32:08 +01:00 |
|
Steffen van Bergerem
|
a11747a579
|
Merge branch 'next-minor' into develop
|
2017-01-07 03:05:13 +01:00 |
|
flaburgan
|
8e5d2f5c65
|
Add links to the aspects and followed tags page on mobile
closes #7265
|
2017-01-07 03:05:01 +01:00 |
|
Benjamin Neff
|
b632155772
|
Merge branch 'next-minor' into develop
|
2017-01-04 02:33:00 +01:00 |
|
Dennis Schubert
|
8709d74c3e
|
Increase the spacing above and below post contents
closes #7267
|
2017-01-04 02:30:02 +01:00 |
|
Benjamin Neff
|
03ae48c820
|
Merge branch 'next-minor' into develop
|
2017-01-03 03:31:56 +01:00 |
|
flaburgan
|
747ea161bf
|
Fix year bg color on /notifications
closes #7263
|
2017-01-03 03:31:47 +01:00 |
|
Benjamin Neff
|
fca13efdf2
|
Merge branch 'next-minor' into develop
|
2016-12-08 03:19:45 +01:00 |
|
Benjamin Neff
|
7ce3982b6d
|
Merge branch 'release/0.6.2.0' into next-minor
|
2016-12-08 03:19:23 +01:00 |
|
Flaburgan
|
f785de7484
|
Reformulate CSRF e-mail
closes #7241
|
2016-12-08 03:16:19 +01:00 |
|
Dennis Schubert
|
d74c182e6f
|
Merge branch 'next-minor' into develop
|
2016-12-04 20:14:16 +01:00 |
|
Dennis Schubert
|
991b047be7
|
Start 0.6.3.0 cycle
|
2016-12-04 20:12:00 +01:00 |
|
Dennis Schubert
|
2c68c1f142
|
Merge branch 'next-minor' into develop
|
2016-12-04 20:10:17 +01:00 |
|
Benjamin Neff
|
6c37171f9f
|
Change last sentence and fix specs
closes #7238
|
2016-12-04 20:10:13 +01:00 |
|
Benjamin Neff
|
3b0c1020c0
|
Merge pull request #6818 from cmrd-senya/1851-mentions-in-comments.new
Mentions in comments backend changes
|
2016-11-29 19:31:43 +01:00 |
|
Benjamin Neff
|
855b148ba5
|
Merge branch 'next-minor' into develop
|
2016-11-27 21:36:41 +01:00 |
|
Justin Ramos
|
fa71af71c1
|
require spec_helper in .rspec
closes #7223
|
2016-11-27 21:27:12 +01:00 |
|
Benjamin Neff
|
5c5ef38908
|
Merge branch 'next-minor' into develop
|
2016-11-26 02:38:55 +01:00 |
|
Steffen van Bergerem
|
9f88850faf
|
Fix 500 on mobile commented and liked streams
Fixes #7218, regression from #7036
closes #7219
|
2016-11-26 02:37:33 +01:00 |
|
Benjamin Neff
|
34787043bb
|
Merge branch 'next-minor' into develop
|
2016-11-25 22:37:21 +01:00 |
|
Justin Ramos
|
3586fa6ae7
|
allowing for graceful unicorn restarts
closes #7217
|
2016-11-25 22:37:06 +01:00 |
|
Steffen van Bergerem
|
443d738aee
|
Merge branch 'next-minor' into develop
|
2016-11-25 15:56:39 +01:00 |
|
Justin Ramos
|
2ca42ea5e6
|
adding content_for(:javascript)
closes #7209
|
2016-11-25 15:56:31 +01:00 |
|
Steffen van Bergerem
|
365441ede2
|
Merge branch 'next-minor' into develop
|
2016-11-25 14:11:05 +01:00 |
|
Justin Ramos
|
6c6f9bb982
|
only show community spotlight link on /contacts if it is enabled
closes #7213
|
2016-11-25 14:10:58 +01:00 |
|
Benjamin Neff
|
b6847f76b5
|
Merge branch 'next-minor' into develop
|
2016-11-24 23:30:24 +01:00 |
|
Justin Ramos
|
43b1632148
|
only require fog/aws
closes #7201
|
2016-11-24 23:14:49 +01:00 |
|
Benjamin Neff
|
99b7229d5a
|
Merge branch 'next-minor' into develop
|
2016-11-22 03:55:12 +01:00 |
|
Steffen van Bergerem
|
0051d6a0b8
|
Move comment, like and reshare creation error translations
closes #7202
|
2016-11-22 03:54:56 +01:00 |
|
Steffen van Bergerem
|
b645541d52
|
Update notifications when changing the stream
fixes #6473
closes #7199
|
2016-11-22 03:00:59 +01:00 |
|
Steffen van Bergerem
|
8e345c0335
|
Add avatar fallback on tags page
fixes #6969
closes #7198
|
2016-11-22 02:43:32 +01:00 |
|
Benjamin Neff
|
12a2e312d9
|
Merge branch 'next-minor' into develop
|
2016-11-19 03:40:57 +01:00 |
|
Steffen van Bergerem
|
5660d2f4a8
|
Refactor comment creation in post interactions backbone model
closes #7186
|
2016-11-19 03:40:42 +01:00 |
|
Steffen van Bergerem
|
9ecbac3ee0
|
Merge branch 'next-minor' into develop
|
2016-11-18 16:40:46 +01:00 |
|
Justin Ramos
|
9aac486510
|
use shared partial for desktop and mobile application head
closes #7194
|
2016-11-18 16:40:23 +01:00 |
|
Steffen van Bergerem
|
8cd26054c8
|
Merge branch 'next-minor' into develop
|
2016-11-18 15:29:00 +01:00 |
|
Augier
|
af331bfb30
|
Add collection to app.views.NotificationDropdown and app.views.Notifications
closes #6952
|
2016-11-18 15:27:37 +01:00 |
|
Benjamin Neff
|
73d352920f
|
Merge branch 'next-minor' into develop
|
2016-11-18 02:14:51 +01:00 |
|
Steffen van Bergerem
|
9bca03d5e9
|
Refactor ShareVisibilitesController
closes #7196
|
2016-11-18 02:10:26 +01:00 |
|
Steffen van Bergerem
|
75f95faebe
|
Update typeahead.js, use the version from rails-assets.org
closes #7192
|
2016-11-18 02:05:32 +01:00 |
|
Steffen van Bergerem
|
f27769bcd2
|
Merge branch 'next-minor' into develop
|
2016-11-17 22:52:35 +01:00 |
|
Justin Ramos
|
00ed1c9b39
|
check AppConfig.mail.enable? before displaying some view content
closes #7190
|
2016-11-17 22:52:18 +01:00 |
|
Steffen van Bergerem
|
9b4f73dc77
|
Merge branch 'next-minor' into develop
|
2016-11-17 22:35:01 +01:00 |
|
Justin Ramos
|
c7a0b053fa
|
fixing invitations modal visibility issue
closes #7191
|
2016-11-17 22:34:54 +01:00 |
|
Benjamin Neff
|
b319e0caa2
|
Merge branch 'next-minor' into develop
|
2016-11-15 22:56:06 +01:00 |
|
Steffen van Bergerem
|
37b34237b9
|
Force jasmine fails on syntax errors
closes #7185
|
2016-11-15 22:50:17 +01:00 |
|
Steffen van Bergerem
|
cdce25374f
|
Reduce i18n.load side effects
closes #7184
|
2016-11-15 22:46:06 +01:00 |
|
Steffen van Bergerem
|
a951c40ba0
|
Only reload profile header when changing aspect memberships
closes #7183
fixes #7072
|
2016-11-15 22:37:39 +01:00 |
|
Steffen van Bergerem
|
1863137161
|
Use string-direction gem for rtl detection
closes #7181
|
2016-11-15 22:33:56 +01:00 |
|
Benjamin Neff
|
13869aa75c
|
Merge branch 'next-minor' into develop
|
2016-11-13 20:11:38 +01:00 |
|
Steffen van Bergerem
|
117b17e25e
|
Remove unused conversations modal fixture
closes #7129
|
2016-11-13 20:11:34 +01:00 |
|
Dennis Schubert
|
b04ce82c49
|
Merge branch 'next-minor' into develop
|
2016-11-06 02:44:00 +01:00 |
|
Dennis Schubert
|
fa329cc032
|
Add changelog note for custom changelog URL.
[ci skip]
|
2016-11-06 02:43:32 +01:00 |
|
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 |
|