Benjamin Neff
fa85b17890
Merge branch 'next-minor' into develop
2017-02-19 03:20:39 +01:00
Steffen van Bergerem
0627cdaf43
Use autosize in modals
...
Fixes #7338 and missing autosize in conversation forms on the profile page
and the contacts page. Regression from #6674 .
closes #7339
2017-02-19 03:20:26 +01:00
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
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
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
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
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
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
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
a87097785e
Merge branch 'next-minor' into develop
2016-09-04 03:31:46 +02:00
Benjamin Neff
8c58206e63
Fix links of more-button on mobile streams
...
Fixes #6999
closes #7036
2016-09-04 03:31:41 +02:00
Dennis Schubert
daff91ea20
Merge branch 'next-minor' into develop
2016-09-04 03:30:10 +02:00
Benjamin Neff
4fea926057
Only update interacted_at on new comments
...
I got feedback from many users, that they don't understand how the "my
activity" stream is sorted, because they have posts on the top, but
don't see why. The user doesn't see if a like was added, and it is also
not imported for the user to see the post again then. And we have
notifications if someone likes a users own posts, so no need to move it on
top of the "my activity" stream here too.
closes #7030
2016-09-04 03:29:59 +02:00
Dennis Schubert
37f8508153
Merge branch 'next-minor' into develop
2016-09-04 03:28:16 +02:00
Steffen van Bergerem
02ad431fb0
Fix conversations message overflow when posting code
...
Related issue: https://github.com/twbs/bootstrap/issues/15958
closes #7055
2016-09-04 03:28:12 +02:00
Dennis Schubert
fa99009d87
Merge branch 'next-minor' into develop
2016-09-04 03:26:47 +02:00
Steffen van Bergerem
c3de77e0fc
Send notification mails on CSRF fails
...
closes #7050
2016-09-04 03:26:42 +02:00
Dennis Schubert
75dcc1008e
Merge branch 'next-minor' into develop
2016-09-04 03:23:02 +02:00
Steffen van Bergerem
806de7e9d8
Exclude closed accounts from search
...
closes #7042
2016-09-04 03:22:58 +02:00
Dennis Schubert
cc8eff9efb
Merge branch 'next-minor' into develop
2016-09-04 03:17:53 +02:00
Steffen van Bergerem
9a2cb1517a
Set participations client side when changing post interactions
...
closes #7040
2016-09-04 03:17:48 +02:00
Dennis Schubert
684d7d8312
Merge branch 'next-minor' into develop
2016-09-04 03:15:39 +02:00
Steffen van Bergerem
ffdd5a14ac
Remove deleted comments when loading more comments
...
closes #7045
2016-09-04 03:15:35 +02:00
Dennis Schubert
0a5df214f2
Merge branch 'next-minor' into develop
2016-09-04 03:06:20 +02:00
Benjamin Neff
b3453c494e
make session-cookie HttpOnly
...
closes #7041
2016-09-04 03:06:15 +02:00
Steffen van Bergerem
c7c9bb9628
Merge branch 'next-minor' into develop
2016-09-04 01:44:31 +02:00
Benjamin Neff
5017bd9541
rewrite notifier template with haml
...
closes #7054
2016-09-04 01:44:15 +02:00
Steffen van Bergerem
175d061032
Merge branch 'next-minor' into develop
2016-09-01 21:51:36 +02:00
Steffen van Bergerem
33b064b8dc
Add changelog for #7039 [ci skip]
2016-09-01 21:50:19 +02:00
Steffen van Bergerem
5c9978a72a
Merge pull request #7039 from lislis/4779-indicate-proper-way-to-report-bugs-in-sidebar
...
Indicate proper way to report bugs in sidebar, close #4779
2016-09-01 13:49:21 +02:00
Dennis Schubert
3f157bec35
Prepare 0.7.0.0 cycle
...
[ci skip]
2016-08-21 23:53:42 +02:00
Dennis Schubert
0921cfb43e
Prepare 0.6.1.0 cycle
...
[ci skip]
2016-08-21 23:52:30 +02:00
Jonne Haß
33c8e029ee
add changelog entry for #6998 [ci skip]
2016-08-18 21:56:10 +02:00
Steffen van Bergerem
bcb34ecaa7
Fix a link in the changelog [ci skip]
2016-08-18 17:16:54 +02:00
Jonne Haß
148e85558a
Merge pull request #7001 from svbergerem/fix-conversation-recipient-suggestions
...
Fix conversations autoSuggest showing non-mutual contacts
2016-08-18 13:36:27 +02:00
Jonne Haß
fedd378dcf
Merge pull request #6992 from SuperTux88/4491-fetch-mentioned-people
...
fetch mentioned people if they don't exist locally yet
2016-08-16 10:41:02 +02:00
Jonne Haß
c53393c5de
Merge pull request #6903 from CSammy/6152-tags-page-slow
...
Improve /tag page performance.
2016-08-15 14:09:59 +02:00
Jonne Haß
200486b6f1
Merge pull request #6984 from SuperTux88/6294-ignore-notifications
...
Don't create notifications from ignored people
2016-08-14 18:28:13 +02:00
Dennis Schubert
3942dca08f
Merge pull request #6972 from jhass/queue_migration
...
Add rake task to move jobs from any legacy queue to the default queue
2016-08-13 17:31:14 +02:00
Jonne Haß
b2fa3357eb
Merge pull request #6976 from SuperTux88/cleanup-invitations
...
Cleanup invitations
2016-08-13 14:16:41 +02:00
Steffen van Bergerem
16618e1054
Merge pull request #6406 from cmrd-senya/comment-expand-optimization-2
...
Comments expansion refactoring
2016-08-12 23:46:22 +02:00
Steffen van Bergerem
bf6af404ee
Merge pull request #6551 from AugierLe42e/bootstrap-markdown
...
Adding bootstrap-markdown editor
2016-08-12 23:37:26 +02:00
Jonne Haß
8deef544dc
Merge pull request #6974 from svbergerem/empty-stream
...
Add 'no posts yet' message to empty streams
2016-08-12 14:11:27 +02:00
Jonne Haß
780c521bd1
Merge pull request #6973 from svbergerem/alert-accessibility
...
Add role='alert' to alerts
2016-08-12 14:10:25 +02:00
Jonne Haß
5afe582057
Add rake task to move jobs from any legacy queue to the default queue
2016-08-11 22:40:49 +02:00
Jonne Haß
47c6b4eff9
Merge branch 'stable' into develop
2016-08-11 21:34:55 +02:00
Jonne Haß
914fbcde0d
Merge branch 'master' into stable
2016-08-11 21:28:41 +02:00
Jonne Haß
0a77f045a3
bump to 0.5.10.2
2016-08-11 20:25:20 +02:00
Senya
bc95de72e4
Fix command in changelog [ci skip]
2016-08-11 14:16:16 +03:00
Steffen van Bergerem
db7ce50b6f
Fix links in Changelog [ci skip]
2016-08-11 03:08:11 +02:00
Jonne Haß
90abad0152
Merge pull request #6950 from cmrd-senya/consolidate-queues
...
Consolidate queues
2016-08-10 11:46:09 +02:00
Jason Robinson
78299c9e2f
Consolidate amount of sidekiq queues from 13 to 5
...
Sidekiq documentation says 'Sidekiq is not designed to work well with dozens of queues.'. Having the amount of queues we have at the moment brings no anyway.
Closes #5571
2016-08-10 08:51:22 +00:00
Jonne Haß
8e887f884e
Merge pull request #6951 from svbergerem/contacts-search
...
Modify search to include contacts
2016-08-09 19:51:46 +02:00
Denys Kurets
ef729425b4
6776 remove unused routes
2016-08-09 10:00:51 +02:00
Steffen van Bergerem
89e6fd7ea5
Merge pull request #6942 from Flaburgan/ruby-2.3
...
Recommend Ruby 2.3, keep Ruby 2.1 as supported
2016-08-08 22:57:46 +02:00
Jonne Haß
ca2dd532af
Merge pull request #6940 from SuperTux88/cleanup-posts-table
...
Cleanup posts table
2016-08-08 20:53:24 +02:00
Jonne Haß
32174aa532
Merge pull request #6932 from SuperTux88/relayable-additional-fields
...
Save relayable signature data
2016-08-08 19:28:21 +02:00
SaiVardhan
18dbf02181
[FIX] #6642 Strip Markdown from conversation title
...
closes #6642
2016-08-08 19:23:17 +02:00
Steffen van Bergerem
5f3e4fc358
Merge pull request #6926 from jhass/timeago_plurals
...
Properly support pluralization in timeago strings
2016-08-08 17:38:30 +02:00
Steffen van Bergerem
c065e19d5b
Merge pull request #6864 from cmrd-senya/6120-aspects-creation-ui
...
Refactor aspects membership dropdown to use handlebars template
2016-08-08 17:26:11 +02:00
Flaburgan
3ff1c3748a
Recommend Ruby 2.3, keep Ruby 2.1 as supported
2016-08-05 12:08:13 +02:00
Jonne Haß
58a355ed01
Expose Sidekiq dead job queue configuration options
...
Set the default limit of dead jobs to 5k, which should equal to about 50M memory
usage in the worst case. Sidekiq's default is 10k. Set the expiration
timeout to 6 weeks, matching our minor release schedule. Sidekiq's
default is 6 months.
Given the new federation code stores the XML payload in the job
parameters, fine-tuning here can give more significant memory savings.
2016-07-20 15:21:17 +02:00
Jonne Haß
66bc049f9b
Merge pull request #6922 from cmrd-senya/6547-adoption
...
Refactored photo extraction
2016-07-18 14:35:00 +02:00
Steffen van Bergerem
59fb227d95
Merge pull request #6914 from denschub/be-excellent
...
Add 'Be excellent to each other!' to the sidebar
2016-07-17 11:00:16 +02:00
Jonne Haß
8fcb66a425
Merge pull request #6910 from SaiVardhan/Issue#6850_private_message
...
[Fix] #6850 Don't include subjects of private message
2016-07-17 09:32:19 +02:00
Jonne Haß
3281f2a72d
Merge pull request #6921 from SuperTux88/cleanup-status_message
...
Cleanup StatusMessage
2016-07-17 09:28:34 +02:00
Jonne Haß
053f69b67c
Merge pull request #6902 from svbergerem/status-message-filter-mentions
...
Filter mentions on status message creation
2016-07-06 22:27:13 +02:00
Jonne Haß
5775647180
update changelog for #6905 [ci skip]
2016-07-06 01:58:32 +02:00
Dennis Schubert
7c6e7dbf0b
Merge branch 'stable' into develop
2016-06-28 22:06:35 +02:00
Dennis Schubert
8cd3f31da6
Merge branch 'master' into stable
2016-06-28 22:06:00 +02:00
Dennis Schubert
8421289e3b
Re-add mysql2 to the Gemfile.lock
2016-06-28 22:05:17 +02:00
Jonne Haß
54026f4a63
update changelog [ci skip]
2016-06-27 10:40:26 +02:00
