Benjamin Neff
746ff52256
Fix mention in #newhere message when invited by another person
...
fixes #7701
closes #7702
2018-02-01 23:35:04 +01:00
Benjamin Neff
f23966ef87
Make mobile bookmarklet work the same way as with desktop UI
...
This fixes that it fails when you call it without notes parameter.
closes #7698
2018-02-01 23:33:36 +01:00
Benjamin Neff
750481497f
Merge branch 'next-minor' into develop
2018-01-31 22:17:07 +01:00
Fla
a72feee812
Changelog misspelling [ci skip]
...
closes #7710
2018-01-31 22:15:27 +01:00
Benjamin Neff
1d683295e1
Merge branch 'next-minor' into develop
2018-01-21 21:30:59 +01:00
flaburgan
b156c2f1a3
Use current-password and new-password for password autocomplete
...
closes #7642
fixes #7633
2018-01-21 21:29:06 +01:00
Dennis Schubert
9ec07911de
Merge branch 'next-minor' into develop
2018-01-12 17:56:17 +01:00
Dennis Schubert
5a6bd47000
Merge branch 'master' into next-minor
2018-01-12 17:56:01 +01:00
Benjamin Neff
5bc4473e11
Fix notifications when people remove their birthday date
...
Some people may remove their birthday date after the notification was
sent, which then breaks the notification page for other users. Let's
just display the date when the notification was created, and not display
the users updated birthday date. When users update from date A to B it
always looks weird anyway, when we display the same new date B twice on
different days, or display two different dates for the same user.
We could remove notifications when users change or remove their
birthday, but that would be way more complex and also we usually don't
remove notifications (not even for deleted posts).
Fixes #7689
closes #7691
2018-01-12 17:52:57 +01:00
Benjamin Neff
b3d3445a7e
Merge branch 'next-minor' into develop
2018-01-09 00:06:44 +01:00
Brad Koehn
1a3c16eb6e
update to support 280 character Twitter
...
closes #7694
closes #7662
fixes #7661
2018-01-09 00:05:33 +01:00
Dennis Schubert
13d24cc611
Merge branch 'next-minor' into develop
2018-01-08 21:15:49 +01:00
Janakas
0347507b20
Delete archive files when closing an account
...
closes #7684
2018-01-08 21:15:41 +01:00
Benjamin Neff
e059b8ad48
Merge branch 'next-minor' into develop
2018-01-05 03:46:06 +01:00
Janakas
d150a6b2af
Fix invite link on /contacts
...
closes #7690
2018-01-05 03:45:54 +01:00
Benjamin Neff
d3632e116a
Merge branch 'next-minor' into develop
2018-01-05 01:50:27 +01:00
Benjamin Neff
c135ace407
Fix notifications when people remove their birthday date
...
Some people may remove their birthday date after the notification was
sent, which then breaks the notification page for other users. Let's
just display the date when the notification was created, and not display
the users updated birthday date. When users update from date A to B it
always looks weird anyway, when we display the same new date B twice on
different days, or display two different dates for the same user.
We could remove notifications when users change or remove their
birthday, but that would be way more complex and also we usually don't
remove notifications (not even for deleted posts).
Fixes #7689
closes #7691
2018-01-05 01:50:11 +01:00
Benjamin Neff
a2ca74265c
Merge branch 'next-minor' into develop
2017-12-30 15:41:04 +01:00
Janakas
2e3b7dee1e
Check for a running redis in script/server
...
Fixes #5267
closes #7685
2017-12-30 15:40:30 +01:00
Benjamin Neff
151a169791
Merge branch 'next-minor' into develop
2017-12-25 20:55:27 +01:00
Benjamin Neff
ba85f35ae9
Merge branch 'release/0.7.2.0' into next-minor
2017-12-25 20:55:22 +01:00
Benjamin Neff
e0eb76eb2a
Remove aspect_ids parameter from publisher
...
closes #7683
2017-12-25 20:54:10 +01:00
Benjamin Neff
c3c0059734
Merge branch 'next-minor' into develop
2017-12-18 04:57:11 +01:00
Benjamin Neff
c5536395c0
Start 0.7.3.0 cycle
2017-12-18 04:55:45 +01:00
Benjamin Neff
d42801a737
Merge branch 'next-minor' into develop
2017-12-18 04:41:49 +01:00
flaburgan
53603917eb
Fix deformed hovercards avatar
...
closes #7656
fixes #6039
2017-12-18 04:40:13 +01:00
Rete2
fc33a2ac5d
Create birthday notification and mailer
...
closes #7624
fixes #1649
2017-12-18 04:34:35 +01:00
Benjamin Neff
21980681b1
Merge branch 'next-minor' into develop
2017-11-01 00:50:23 +01:00
Benjamin Neff
89eeec72d3
Merge branch 'master' into next-minor
2017-11-01 00:50:17 +01:00
Benjamin Neff
7c4648030f
Run rake directly without xvfb on travis
...
closes #7654
2017-11-01 00:46:36 +01:00
Benjamin Neff
6351399197
Merge branch 'next-minor' into develop
2017-10-27 02:27:11 +02:00
Benjamin Neff
70410d1691
Ignore invalid diaspora:// links
...
Fixes #7651
closes #7652
2017-10-27 02:26:52 +02:00
Benjamin Neff
30a940f483
Merge branch 'next-minor' into develop
2017-10-20 02:56:20 +02:00
Benjamin Neff
4bf0a74382
Merge branch 'release/0.7.1.0' into next-minor
2017-10-20 02:56:16 +02:00
Benjamin Neff
0f688b9d73
Group notifications by updated_at
...
The notifications need to be grouped by the same date as they are
sorted, otherwise the date used for the group doesn't match all
timestamps in the group and also the groups are sorted by the wrong
date.
This fixes #7647 , a regression of #7568 .
closes #7648
2017-10-20 02:56:06 +02:00
Benjamin Neff
66095e3f03
Merge branch 'next-minor' into develop
2017-10-18 01:08:48 +02:00
Benjamin Neff
31559ce483
Merge branch 'release/0.7.1.0' into next-minor
2017-10-18 01:08:35 +02:00
Benjamin Neff
9673f45ff9
Cleanup empty signatures
...
Some relayables from redmatrix and hubzilla have empty signatures. They
are invalid and break therefore the user data export.
closes #7644
2017-10-18 01:08:26 +02:00
Benjamin Neff
d6bec055e7
Merge branch 'next-minor' into develop
2017-10-17 01:39:46 +02:00
Benjamin Neff
1ac0dfbbbc
Merge branch 'release/0.7.1.0' into next-minor
2017-10-17 01:39:39 +02:00
cmrd Senya
2e9c6f46dc
Clean up invalid contacts from the DB
...
Cleans invalid contacts where the referenced user was deleted from the DB or where
the referenced person owner was deleted from the DB.
closes #7632
2017-10-17 01:39:22 +02:00
Benjamin Neff
a36d22d72b
Handle duplicate account migrations
...
closes #7641
2017-10-17 01:36:25 +02:00
Benjamin Neff
2bd9c663c5
Add rake task to rerun failed account deletions
...
closes #7639
2017-10-17 01:33:43 +02:00
flaburgan
faff140a3f
Avoid page to jump to top after a post deletion, fixes #7628
...
closes #7638
2017-10-17 01:30:12 +02:00
Benjamin Neff
2711b9dc83
Cleanup relayables where the signature is missing
...
When we should have the signature but don't have it, the user data
export fails. There are a few comments from back in 2011 where the
signature is missing.
Also some podmins maybe messed with signatures in their database, which
would also break the exports now.
closes #7637
2017-10-17 01:27:00 +02:00
Benjamin Neff
32067246df
Delete people with invalid diaspora IDs (friendica with path)
...
closes #7630
2017-10-17 01:23:47 +02:00
Benjamin Neff
4bbb25fedf
Merge branch 'next-minor' into develop
2017-09-28 23:39:56 +02:00
Benjamin Neff
1b6ffa2528
Start 0.7.2.0 cycle
2017-09-28 23:38:57 +02:00
Benjamin Neff
0029f2c1da
Merge branch 'next-minor' into develop
2017-09-28 23:11:56 +02:00
Benjamin Neff
fd36517dee
Limit the number of parallel exports that are allowed to run
...
closes #7629
2017-09-28 23:11:46 +02:00
Benjamin Neff
b8fb4b6251
Delete invalid oEmbed caches with binary titles
...
There are a few old oEmbed caches which have the title saved in binary
(because they contain Chinese characters). This fails with
`ActionView::Template::Error ("å" from ASCII-8BIT to UTF-8)`. Since I
found only very old OEmbed caches with this problem (newest from 2012),
I think we can just remove these. When I create a new oEmbed cache for
the same URL it creates it without `!binary`.
closes #7620
2017-09-28 23:10:07 +02:00
Benjamin Neff
3fafcd9307
The diaspora ID validator now validates if it is lowercase
...
Relaying relayables will fail with non-lowercase authors.
closes #7625
2017-09-28 23:08:41 +02:00
Benjamin Neff
829882cf58
Merge branch 'next-minor' into develop
2017-09-28 03:28:30 +02:00
Benjamin Neff
95fbd3fc66
Don't change the filename of the export everytime the user is touched
...
closes #7622
2017-09-28 03:28:15 +02:00
Benjamin Neff
ac39e920c8
Add camo to NodeInfo
...
closes #7617
2017-09-28 03:20:31 +02:00
Benjamin Neff
760b928902
Merge branch 'next-minor' into develop
2017-09-26 04:07:43 +02:00
cmrd Senya
c6ed850a85
Memory usage optimization for archive export
...
- Removed posts and non contacts from other's data
- Collections are exported in batches to lower memory footprint
- In base exporters create User object instead of keeping instance because it caches all associations
closes #7627
2017-09-26 04:07:18 +02:00
cmrd Senya
9ee9dbe969
Fix local migration run without old private key
...
It was possible to run migration locally without providing old private
key. This way migration was performed but not dispatched, which obviously
leads to desynchronization of the federation state so let's validate sender
before performing any actual actions.
closes #7558
2017-09-26 04:06:16 +02:00
Benjamin Neff
d410b62323
Merge branch 'next-minor' into develop
2017-09-19 20:28:36 +02:00
Benjamin Neff
c8340f7d28
Merge branch 'master' into next-minor
2017-09-19 20:26:57 +02:00
Benjamin Neff
13d6c23713
Bump nokogiri for a security release
2017-09-19 20:20:57 +02:00
Benjamin Neff
9f18d5ba82
Merge branch 'next-minor' into develop
2017-09-18 03:25:02 +02:00
Benjamin Neff
655fe2a912
Cleanup invalid polls without status message
...
closes #7614
2017-09-18 03:24:52 +02:00
Benjamin Neff
26a9e50ef9
Merge branch 'next-minor' into develop
2017-09-17 19:36:00 +02:00
Benjamin Neff
4c967903fe
Remove rails_admin_histories table
...
This was a leftover from rails_admin which was removed in #7440 .
closes #7597
2017-09-17 19:35:50 +02:00
Benjamin Neff
84d553555e
Remove unneeded .freeze
...
closes #7595
2017-09-17 19:32:45 +02:00
Steffen van Bergerem
f9029dbdaf
Merge branch 'next-minor' into develop
2017-08-29 12:55:17 +02:00
Benjamin Neff
e31c5ff4dc
Handle unauthenticated users for likes/comments of private posts
...
closes #7583
2017-08-29 12:55:03 +02:00
Benjamin Neff
295bb15f73
Merge branch 'next-minor' into develop
2017-08-29 02:17:47 +02:00
Steffen van Bergerem
d130697ce2
Use Bootstrap 3 progress-bar for polls
...
closes #7600
2017-08-29 02:17:32 +02:00
Steffen van Bergerem
02d9d350d9
Move person extension for prefills to conversations form view
...
closes #7599
2017-08-29 02:13:57 +02:00
flaburgan
a358bf7b66
Move the notification to be the first icon on the left
...
closes #7592
2017-08-29 02:09:51 +02:00
Steffen van Bergerem
98cccda6ea
Remove auto detection of languages with highlightjs
...
Fixes #7476
closes #7591
2017-08-29 02:07:57 +02:00
Steffen van Bergerem
cd09c75c50
Prevent users from zooming in IE Mobile
...
Fixes #7499
According to https://msdn.microsoft.com/en-us/library/dn629259(v=vs.85).aspx ,
“the minimum-scale, maximum-scale, and initial-scale properties are currently
unsupported for Internet Explorer for Windows Phone“.
For further information on the viewport properties see
https://drafts.csswg.org/css-device-adapt/#viewport-meta
closes #7589
2017-08-29 02:04:00 +02:00
goobertron
e7cac2e466
Replace <b> with <strong> in translations
...
closes #7585
2017-08-29 02:00:34 +02:00
Benjamin Neff
e7a1fe6e78
Merge branch 'next-minor' into develop
2017-08-26 03:16:23 +02:00
Rete2
b556ad5211
show users vote in poll
...
closes #7550
2017-08-26 03:16:05 +02:00
Benjamin Neff
e08440d7ba
Merge migrations from before 0.6.0.0 to 0000_create_schema.rb
...
closes #7580
2017-08-26 03:13:05 +02:00
Benjamin Neff
b040f85790
Remove root_guid from reshares when post is deleted
...
And cleanup old reshares with deleted root posts
closes #7578
2017-08-26 03:08:37 +02:00
Manuel Vögele
0f771dbb10
Remove tiff support from photos
...
closes #7576
2017-08-26 03:02:51 +02:00
Steffen van Bergerem
ce40ec128f
Fix mixed username and timestamp with LTR/RTL scripts
...
Fixes #7424
closes #7575
2017-08-26 02:59:24 +02:00
Steffen van Bergerem
c91c19b633
Order notifications by updated_at instead of created_at
...
closes #7568
2017-08-26 02:57:16 +02:00
Benjamin Neff
5ea7b8ee13
Set fog_provider and load carrierwave/storage/fog if S3 is enabled
...
Fixes #7563
closes #7566
2017-08-26 02:50:18 +02:00
Steffen van Bergerem
95ac7d0123
Merge branch 'next-minor' into develop
2017-08-25 01:51:47 +02:00
Deus Figendi
e547a89246
fixes #7573 long poll answers
...
closes #7579
2017-08-25 01:51:31 +02:00
Steffen van Bergerem
974fbd4d03
Merge branch 'next-minor' into develop
2017-08-24 14:57:59 +02:00
Benjamin Neff
9240605ad5
Remove internet explorer version check
...
This was in all stack traces, which confused people ...
We currently only support IE11, so the version check was already old
again ...
When we break old browser versions, we don't check that for other
browsers. So older IE browser just break, like very other older browser
too.
closes #7557
2017-08-24 14:57:43 +02:00
Steffen van Bergerem
680894d121
Merge branch 'next-minor' into develop
2017-08-19 12:39:42 +02:00
Batyr Nuryyev
951a258a3d
no title upon hover on button
...
closes #7551
2017-08-19 12:39:35 +02:00
Steffen van Bergerem
9ffbf2f788
Merge branch 'next-minor' into develop
2017-08-19 12:31:31 +02:00
ivan sebastian
3016280ef1
add jquery are you sure to comment form
...
closes #7530
2017-08-19 12:31:24 +02:00
Benjamin Neff
11372035b8
Start 0.8.0.0 cycle
2017-08-15 01:49:51 +02:00
Benjamin Neff
0c1dd195da
Start 0.7.1.0 cycle
2017-08-15 01:45:45 +02:00
Benjamin Neff
ecd4601bac
Remove 0.6.8.0 from Changelog
2017-08-15 01:40:01 +02:00
Benjamin Neff
cbc3900d59
Merge pull request #6750 from cmrd-senya/account_migration_message
...
Account migration model/message
2017-08-15 01:13:43 +02:00
Benjamin Neff
d6225daaf3
Merge pull request #7534 from oneturkmen/enable-mobile-web-app-capable-meta
...
added tag for supporting apps prior to Chrome M39
2017-08-15 00:56:43 +02:00
Benjamin Neff
1bd630d8a1
Merge pull request #7536 from SuperTux88/refactor-publisher-preview
...
Remove avatar, name, timestamp and interactions from publisher preview
2017-08-14 04:07:56 +02:00
Benjamin Neff
7a21c227f7
Merge pull request #7535 from SuperTux88/unstuck-export
...
Reset stuck exports and handle errors
2017-08-14 04:05:25 +02:00
Benjamin Neff
9adcca2679
Merge pull request #7533 from SuperTux88/add-indexes
...
Add missing indexes from #7234
2017-08-13 20:57:39 +02:00
Benjamin Neff
4b1c5685a9
Merge pull request #7529 from SuperTux88/actionview-loglevel
...
Disable rendering logging in production
2017-08-13 13:12:14 +02:00
Benjamin Neff
138b706259
Merge pull request #7528 from Flaburgan/update-help
...
Update help
2017-08-13 04:56:03 +02:00
Benjamin Neff
ce5e42c471
Merge pull request #7182 from svbergerem/spv-load-initial-interactions
...
Single post view interaction refactorings
2017-08-12 19:16:00 +02:00
Benjamin Neff
dc92633dab
Merge pull request #7514 from SuperTux88/rails5
...
Upgrade to rails 5.1
2017-08-12 15:43:15 +02:00
Steffen van Bergerem
7624854495
Merge pull request #7235 from AugierLe42e/md-editor-mobile-view
...
Markdown editor final chapter: add editor on publisher, comments and conversation of mobile view
2017-08-12 11:56:57 +02:00
Steffen van Bergerem
a6fb85d10f
Merge pull request #7524 from ivantedja/7273-cmd-enter-submit
...
support cmd+enter for post submission
2017-08-12 11:55:23 +02:00
Benjamin Neff
280a9e2023
Merge pull request #7523 from svbergerem/improve-adding-posts-to-stream
...
Improve adding posts to stream
2017-08-11 03:21:48 +02:00
flaburgan
ae73294f41
Improved responsive header
2017-08-10 17:51:01 +02:00
Benjamin Neff
9d2d20e854
Merge pull request #6726 from cmrd-senya/archive-schema
...
Update the user data export archive format.
2017-08-10 10:54:02 +02:00
Benjamin Neff
eefa6701a8
Merge pull request #7520 from svbergerem/increase-mobile-post-action-size
...
Include count in mobile post action link and increase reshare counter after reshare
2017-08-10 01:30:39 +02:00
Benjamin Neff
05a4bf262a
Merge pull request #7518 from svbergerem/fix-7245
...
Prevent publisher from closing in preview mode
2017-08-10 01:27:55 +02:00
Benjamin Neff
c06af05e19
Merge pull request #7516 from Flaburgan/back-to-top-position
...
Move back to top to the right to avoid misclicks
2017-08-10 01:26:28 +02:00
Steffen van Bergerem
32233ccb99
Merge pull request #7482 from cmrd-senya/markdown-editor-conversations-comments
...
Add markdown editor on conversations and comments
2017-08-09 21:50:35 +02:00
flaburgan
1eea034844
Add a test
2017-08-07 20:21:51 +02:00
Benjamin Neff
d0896c7823
Merge pull request #7512 from SuperTux88/well-known
...
Cleanup .gitignore and add note about .well-known to the changelog
2017-08-04 03:08:03 +02:00
Benjamin Neff
c6a0fbe8d4
Cleanup .gitignore and add note about .well-known to the changelog
...
[ci skip]
2017-08-04 00:54:51 +02:00
Benjamin Neff
20822d3333
Merge pull request #7508 from svbergerem/mobile-comment-link
...
Direct links to mobile comments
2017-07-31 03:23:13 +02:00
Benjamin Neff
7baa3c0e24
Merge pull request #7495 from codebearsteam/6559-ergonomy-suggestion
...
Issue #6559 : Changed default mail FROM header and tests
fixes #6559
2017-07-25 01:13:32 +02:00
Benjamin Neff
da904ac025
Merge pull request #7503 from SuperTux88/quickfix-multi-stream-ignore-users-with-tags
...
Exclude ignored people from followed tags when building stream-relation
2017-07-24 01:35:58 +02:00
Benjamin Neff
d8410e21b3
Merge pull request #7259 from Flaburgan/bump-ruby-2.4
...
Bump ruby to 2.4
2017-07-23 18:00:06 +02:00
flaburgan
33fa2e8a9e
Bump ruby to 2.4
2017-07-23 02:41:29 +02:00
Benjamin Neff
5d2ddfede1
Update changelog [ci skip]
2017-07-14 02:34:53 +02:00
Benjamin Neff
58609e42d7
Merge branch 'next-minor' into develop
2017-07-05 02:10:24 +02:00
Benjamin Neff
58aa59fb8e
Start 0.6.8.0 cycle
2017-07-05 02:07:45 +02:00
Benjamin Neff
068acd93ce
Cleanup changelog (no bugfixes in this release)
2017-07-05 02:04:07 +02:00
Benjamin Neff
0e13a316f6
Cleanup some translations
...
closes #7465
2017-07-05 02:02:13 +02:00
flaburgan
ddda28102c
Clean up the footer links a bit
...
closes #7446
2017-07-05 01:59:18 +02:00
flaburgan
07d0ed916d
Fix design issues + pronto
...
closes #7295
2017-07-05 01:51:07 +02:00
Benjamin Neff
d71aa6a54a
Merge branch 'next-minor' into develop
2017-07-03 03:46:54 +02:00
atulonruby
df1139234f
Warn user if he leaves profile editing page #6520
...
closes #7473
closes #6589
2017-07-03 03:45:57 +02:00
Benjamin Neff
44e10a9172
Merge branch 'next-minor' into develop
2017-05-26 01:51:37 +02:00
Mahonri Gibson
5739f67605
Save email without confirmation when podmail is disabled.
...
fixes #7195
closes #7455
2017-05-26 01:50:55 +02:00
Benjamin Neff
a7093c6f7d
Merge branch 'next-minor' into develop
2017-05-23 00:17:19 +02:00
Benjamin Neff
a6869197d8
Start 0.6.7.0 cycle
...
[ci skip]
2017-05-23 00:15:06 +02:00
Dennis Schubert
1e06fd786c
Merge branch 'next-minor' into develop
2017-05-21 12:06:41 +02:00
Benjamin Neff
e177706769
Add admin account username to NodeInfo metadata
...
Fixes #7421
closes #7447
2017-05-21 12:06:35 +02:00
Benjamin Neff
e463397122
Merge branch 'next-minor' into develop
2017-05-16 00:37:06 +02:00
cmrd Senya
6abd0509f9
Use guid instead of id at permalink and in SPV
...
This changes links from /posts/:id to /posts/:guid where the links are
not clicked very often. ID search is faster than guid search so we can't
change it everywhere, but these links are not very useful for clicking,
but can be used for easier guid look up.
closes #7453
2017-05-16 00:36:43 +02:00
Benjamin Neff
ee05cc8270
Merge branch 'next-minor' into develop
2017-05-13 02:09:25 +02:00
Mahonri Gibson
942e090b3a
Fix welcome message crashing server if podmin is set to invalid user.
...
Fixes #7363
closes #7452
2017-05-13 02:08:51 +02:00
Benjamin Neff
f4f0e724c6
Merge branch 'next-minor' into develop
2017-05-11 04:24:29 +02:00
Benjamin Neff
02b4d3f347
Don't raise when the public key of a person is "broken"
...
Breaking a public key of a person can be used to "block" receiving posts
from this person on the pod. So we should handle that case better and
not just trigger many retries for something that will fail again.
closes #7448
2017-05-11 04:24:13 +02:00
Benjamin Neff
7d9c6c85bd
Remove rails_admin
...
This is now broken since more than half a year, so I think we can just
remove it.
Podmins shouldn't use this anyway, because it does bad things, like
replacing NULL with an empty string when editing something. If we really
need an admin interface for something, we should add it to our own admin
panel at /admins/dashboard.
Fixes #7027 and #6413
closes #7440
2017-05-11 04:18:33 +02:00
Benjamin Neff
064fc3cc45
Merge branch 'next-minor' into develop
2017-05-05 02:30:56 +02:00
Steffen van Bergerem
23d3d9dc3f
Use post page title for atom feeds and add entry author
...
Fixes #7249
closes #7420
2017-05-05 02:30:46 +02:00
Steffen van Bergerem
fc28d6af35
Fix first comment in mobile view with french locale
...
Fixes #7438 . The regression has possibly been introduced by #7207 .
closes #7441
2017-05-05 02:26:22 +02:00
Benjamin Neff
caaea50cf6
Merge branch 'next-minor' into develop
2017-04-26 22:18:02 +02:00
pskosinski
afef279aff
Fix untranslatable photo upload button's hover text
...
closes #7429
fixes #7427
2017-04-26 22:17:44 +02:00
Dennis Schubert
3eeee4b5de
Merge branch 'next-minor' into develop
2017-04-12 01:29:50 +02:00
Dennis Schubert
69be912478
Start 0.6.6.0 cycle
...
[ci skip]
2017-04-12 01:28:18 +02:00
Benjamin Neff
e91a0a57a3
Merge branch 'next-minor' into develop
2017-04-08 00:00:56 +02:00
Steffen van Bergerem
3971a24d68
Add avatar fallback for avatar next to publisher
...
closes #7414
2017-04-08 00:00:45 +02:00
Benjamin Neff
24b40a4c01
Merge branch 'next-minor' into develop
2017-04-06 01:02:26 +02:00
Amadren
30fad8279b
Improve csp for a better cloudflare support
...
closes #7367
2017-04-06 01:01:50 +02:00
Steffen van Bergerem
a61031710c
Merge branch 'next-minor' into develop
2017-04-02 12:51:35 +02:00
cmrd Senya
f1c1091162
Remove unused cucumber step
...
"should see JSON"
closes #7410
2017-04-02 12:51:27 +02:00
Dennis Schubert
9a76cf7d3b
Merge branch 'next-minor' into develop
2017-03-29 22:33:43 +02:00
Dennis Schubert
8e8af0bfa5
Merge branch 'master' into next-minor
2017-03-29 22:32:20 +02:00
Dennis Schubert
610f39e991
Bump nokogiri for a security release
2017-03-29 22:29:05 +02:00
Dennis Schubert
ec6a6d5138
Merge branch 'next-minor' into develop
2017-03-28 06:42:53 +02:00
Waithamai
38450eacea
Added spacing between list items fixes #7400
...
closes #7401
2017-03-28 06:42:43 +02:00
Dennis Schubert
10bf1c0925
Merge branch 'next-minor' into develop
2017-03-28 01:57:02 +02:00
Benjamin Neff
35f4d61d11
Disable rack session cookie for sidekiq
...
Since 4.2.3 sidekiq allows to disable its own session cookie for the
case where the app provides a session already.
closes #7395
2017-03-28 01:56:52 +02:00
Benjamin Neff
5de83b881b
Merge pull request #7399 from svbergerem/remove-statistics-json
...
Remove statistics.json
2017-03-28 00:08:16 +02:00
Benjamin Neff
d9b02418b6
Merge branch 'next-minor' into develop
2017-03-27 00:04:53 +02:00
Steffen van Bergerem
4a56c0465c
Remove outdated rtl styles
...
These lines might have been necessary some time ago but now they are making things worse.
closes #7374
2017-03-27 00:04:38 +02:00
Steffen van Bergerem
4a944c5ab4
Use small avatar in the person json
...
closes #7376
2017-03-27 00:02:10 +02:00
Steffen van Bergerem
6f3c61d8f2
Increase maximal height of large thumbnail
...
Fixes #6248 , supersedes #6244 .
closes #7383
2017-03-27 00:00:41 +02:00
Steffen van Bergerem
8a98cd4517
Refactor destroyModel function in base view
...
closes #7385
2017-03-26 23:53:37 +02:00
Steffen van Bergerem
5b0b3d989b
Merge pull request #7394 from SuperTux88/mention-backport-on-receive
...
Only backport mention syntax when the author is local
2017-03-26 12:26:52 +02:00
Benjamin Neff
af0a5e32a1
Merge pull request #7369 from svbergerem/color-themes-i18n
...
i18n for color themes
2017-03-26 03:12:54 +02:00
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
