Benjamin Neff
|
06b61b6480
|
Merge branch 'next-minor' into develop
|
2017-03-25 20:38:00 +01:00 |
|
Steffen van Bergerem
|
05e9798027
|
Fix sharing indicator on profile page for blocked users
closes #7382
|
2017-03-25 20:35:45 +01:00 |
|
Steffen van Bergerem
|
d3de97b244
|
Disable autocomplete for the conversation form recipient input
closes #7375
|
2017-03-25 20:34:13 +01:00 |
|
Steffen van Bergerem
|
b0da14c383
|
Merge pull request #7386 from cmrd-senya/comment-mention-front-end
Comment mentions front-end
|
2017-03-24 00:20:37 +01:00 |
|
Steffen van Bergerem
|
a2ca68b523
|
Merge branch 'next-minor' into develop
|
2017-03-21 13:34:59 +01:00 |
|
flaburgan
|
ad7d4d777b
|
Add links to liked and commented pages within My activity
closes #5502
|
2017-03-21 13:34:47 +01:00 |
|
Steffen van Bergerem
|
80b53adcf0
|
Merge branch 'next-minor' into develop
|
2017-03-21 13:08:52 +01:00 |
|
flaburgan
|
b3e3de08b8
|
Fix block user failing feature
closes #7379
|
2017-03-21 13:08:44 +01:00 |
|
Steffen van Bergerem
|
b2d0feb00d
|
Merge pull request #7303 from cmrd-senya/jquery3
Use jQuery 3
|
2017-03-18 16:06:05 +01:00 |
|
Steffen van Bergerem
|
ca6ce912d3
|
Merge branch 'next-minor' into develop
|
2017-03-17 11:34:56 +01:00 |
|
cmrd Senya
|
526ebcfa13
|
In jQuery 3 "#" is disallowed as a selector
here is a somewhat hacky way to force use an empty selector where "#"
was used as a selector before
closes #7372
|
2017-03-17 11:34:45 +01:00 |
|
Steffen van Bergerem
|
1b9ab16039
|
Merge branch 'next-minor' into develop
|
2017-03-06 21:11:54 +01:00 |
|
cmrd Senya
|
2739259fb6
|
some more replacements for deprecated jquery methods
closes #7356
|
2017-03-06 21:11:47 +01:00 |
|
Steffen van Bergerem
|
0aefc76aaa
|
Merge branch 'next-minor' into develop
|
2017-03-06 21:10:31 +01:00 |
|
Senya
|
0e28cfadb2
|
remove unused setPreload function
closes #7354
|
2017-03-06 21:10:25 +01:00 |
|
Benjamin Neff
|
351b4d28bf
|
Merge branch 'next-minor' into develop
|
2017-03-05 01:58:24 +01:00 |
|
Benjamin Neff
|
13698bece5
|
Start 0.6.5.0 cycle
|
2017-03-05 01:56:50 +01:00 |
|
Benjamin Neff
|
ae687cf1d5
|
Merge branch 'next-minor' into develop
|
2017-03-05 00:01:11 +01:00 |
|
Benjamin Neff
|
8e4261100b
|
Create asterisk.png without digest after precompile
fixes #7317
closes #7322
|
2017-03-04 23:58:08 +01:00 |
|
Benjamin Neff
|
e1bf447aad
|
Merge branch 'next-minor' into develop
|
2017-03-04 21:08:18 +01:00 |
|
Steffen van Bergerem
|
12deda1429
|
Change regexp for hashtags
Fixes #5765, fixes #5815, supersedes #6099.
closes #7350
|
2017-03-04 21:08:11 +01:00 |
|
Benjamin Neff
|
0488902b66
|
Merge branch 'next-minor' into develop
|
2017-02-19 21:56:19 +01:00 |
|
Steffen van Bergerem
|
bb2826842f
|
Only display invite link on contacts page if invitations are enabled
fixes #7340
closes #7342
|
2017-02-19 21:55:10 +01:00 |
|
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 |
|