Commit graph

261 commits

Author SHA1 Message Date
Miguel Alatzar
913f05e131
[MM-16011] Update screens related to main sidebar (#2907)
* Update screens

* Update login tests

* Remove done

* Fix failing tests

* Update screens and components

* Check styles fix

* Update tests

* Prevent setState call after component unmounts

* Add empty setButtons func to dummy navigator

* Remove platform check

* Remove Platform import

* Update react-native-navigation version

* Add separate showModalOverCurrentContext function

* check-style fixes

* Remove overriding of AppDelegate's window

* Fix modal over current context animation

* Add showSearchModal navigation action

* Check-style fix

* Address review comments
2019-06-24 10:58:15 -07:00
Elias Nahum
6546dfdfd2
Set post list data and timestamp based on the user timezone if available (#2888) 2019-06-17 15:24:28 -04:00
Elias Nahum
29240b9c6f
MM-16061 Keep unread channels in place on Tablets (#2865) 2019-06-06 15:15:40 -04:00
Elias Nahum
90d9b7acca
Fix code so it can be parsed by mmjstool (#2816) 2019-05-22 09:31:30 -04:00
Elias Nahum
bbfd6e820f
Fix select default channel (#2800)
* Fix select default channel

* use utility with channels in team object

* feedback review

* update mattermost-redux
2019-05-16 20:02:19 -04:00
Miguel Alatzar
45e5bae8da
Avoid possible reading of length property on undefined (#2783) 2019-05-10 09:34:23 -07:00
Miguel Alatzar
1a81daaa37
[MM-15379] Avoid possible reading of .name on undefined (#2778)
* Avoid possible reading of property on undefined

* Add unit test for handleSelectChannelByName

* Update mattermost-redux hash
2019-05-08 13:16:03 -07:00
Saturnino Abril
e086d66ec2
[MM-13955] Add telemetry for Android (#2719)
* add markers for Android profiling

* update per comments

* Remove beta build flag

* update per comment, latest change on telemetry server and others

* rebase and fix merge conflicts, and update per comments

* update commit hash of mattermost-redux
2019-05-08 00:23:59 +08:00
Jesús Espino
c769b536ae
Creating the concept of RedirectChannel and use it before the DefaultChannel when we are redirecting the user (#2674)
* Creating the concept of RedirectChannel and use it before the DefaultChannel when we are redirecting the user

* upgrading to the last mattermost-redux version
2019-04-16 23:34:02 +02:00
Harrison Healey
9c53852128
Reorganize post state and make postsInChannel into a sparse array (#2693)
* MM-13957 Reorganize post actions (#2553)

* MM-13957 Reorganize post actions

* Update mattermost-redux

* Update mattermost-redux

* Update package-lock.json to resolve build issues

* MM-13958/MM-13959 Make postsInChannel into a sparse array (#2600)

* MM-13960 Re-add combined system messages (#2637)

* MM-13960 Re-add combined system messages

* Pass entire post to PostOptions

* Update mattermost-redux

* Update mattermost-redux

* Address feedback

* Update mattermost-redux
2019-04-15 17:20:23 -04:00
Joram Wilander
77fe06794f Generate random channel URL name from display names that don't clean into a usable name (#2679) 2019-03-28 13:34:56 -07:00
Elias Nahum
f539ddf765
MM-14630 Mark channel as read and viewed when opening brought from the background (#2658) 2019-03-19 19:58:23 -03:00
Saturnino Abril
b5e4b5a657
fix channel mention badge and posts after opening the app from push notification (which is initially at closed state) (#2648) 2019-03-16 00:04:30 +08:00
Saturnino Abril
8719d3f227 fix channel mention when app is started from push notification (#2638) 2019-03-11 15:36:02 -04:00
Elias Nahum
41c675fd84
Set the correct channel display name when switching teams (#2625) 2019-03-05 11:56:24 -03:00
Elias Nahum
88f5848850
Dependencies update (#2576)
* Dependencies update

* Fix WebView

* Update to RN 0.58.5 and include the WebSocket fix

* Update react-native-video

* Fix RNFetchBlob
2019-02-20 17:17:04 -03:00
Daniel Schalla
e82146d52f
[MM-10346] Set CSRF Token from Cookie after Login / on App load (#2534)
* Set CSRF Token from Cookie after Login / on App load

* Reset CSRF on Logout

* Simplify cookie value access

* Make Set CSRF Blocking
2019-02-20 17:06:03 +01:00
Elias Nahum
a0a1fa28ce
MM-13896 Sync channel as read between clients (including opening Push Notifications) (#2548)
* Update mattermost-redux to use latest WS changes

* Properly mark channel as read, keep the new message indicator, and fix push notification flow

* unneeded parameter in setCurrentUserStatusOffline

Co-Authored-By: enahum <nahumhbl@gmail.com>

* Feedback review

* Update mm-redux ref
2019-02-16 15:09:22 -03:00
Chris Duarte
ffe6b9e2ef Deep linking based on channel url; Fix merge conflicts (#2542)
Code cleanup
2019-02-14 13:29:57 -05:00
Elias Nahum
23e58f2ea1 MM-13830 Ensure schedule of session expired notification (#2554)
* Ensure schedule of session expired notification

* feedback review

* passing intl instead of message
2019-02-07 13:42:26 -08:00
Elias Nahum
477dcbb1c5 Fix other users status changes (#2491) 2019-01-07 15:15:12 -05:00
Brad Coughlin
15b44e9d71 MM-12354 Remove Profile Image (#2428)
* save progress

* Add option to remove profile picture

* missed when rebasing

* rename extraOptions to removeProfileImage

* clean up removeProfileImage action

* placeholder after removing profile picture, unit tests
2018-12-17 07:56:39 +08:00
Elias Nahum
fa12bb18ad
MM-13431 Fix load more posts (#2452)
* Load more posts of a channel by determining the amount of posts shown regardless of how many are in the store

* Feedback review

* do not combine posts when fetching them
2018-12-13 08:38:23 -03:00
Elias Nahum
2184696e65
post menu and file attachments (#2414)
* post menu and file attachments

* Fix post list selector test

* Use new Gesture handler to avoid gesture conflicts in post menu and reaction list

* Allow reaction list to scroll the header on Android

* Feedback review

* Add some comments

* Fix eslint
2018-12-05 14:59:41 -03:00
Jesús Espino
4148ee93e5 MM-12960: Only back to previous channel if is not archived (#2389) 2018-11-28 10:31:48 -05:00
Elias Nahum
508ffad00f Count the posts received after combining join/leave (#2378) 2018-11-27 14:38:32 -05:00
Joram Wilander
e431bd36c4
MM-12845 Add widgets and interactive dialogs (#2353)
* Add widgets and interactive dialogs

* Update snapshots

* Updates per feedback and fix slash command

* Fix style

* Update styling

* Updates per feedback

* Updates per feedback

* More styling changes

* Remove extra space above message menu
2018-11-23 12:30:12 -05:00
Elias Nahum
6df0f8b915
Set the user status as offline when the app loses connection (#2366) 2018-11-22 11:09:55 -03:00
Harrison Healey
9727476ef6 MM-12901 Improve handling of hashtags on Recent Mentions, Flagged Posts, and Permalink screens (#2329)
* MM-12901 Create showSearchModal action and use for hashtags

* MM-12901 Improve handling of hashtags on Recent Mentions, Flagged Posts, and Permalink screens
2018-11-09 20:43:22 -03:00
Elias Nahum
19a755d59f Fix when message have multiple actions (#2331)
* Fix when message have multiple actions

* Feedback review
2018-11-09 18:38:58 -05:00
Elias Nahum
9db040bcf7
Retry fetching teams if no teams are found (#2288)
* Retry fetching teams if no teams are found

* Remove flow
2018-10-27 00:50:19 -03:00
Harrison Healey
cfb372f75a
MM-11157 Switch ESLint to use eslint-config-mattermost (#2247) 2018-10-11 13:35:25 -04:00
Joram Wilander
10a1e93e7d MM-12348 Persist interactive menu choices past channel switch and share with thread view (#2207)
* Persist interactive menu choices past channel switch and share with thread view

* Remove unneeded async
2018-10-03 15:08:05 -03:00
Jesús Espino
2a75ee022c
MM-11606: Back to prev channel on close archived channel (#2183) 2018-09-27 19:02:02 +02:00
Jesús Espino
9668bdc894
MM-11577: Back to previous channel on archive (#2172)
* MM-11577: Back to previous channel on archive

* Add last mattermost-redux version
2018-09-27 18:15:45 +02:00
Joram Wilander
ef3ba7eb00
MM-11934 Add interactive action menus (#2099)
* Add interactive action menus

* Add snapshot tests

* Updates per feedback

* Update styling of menu action

* Updates per feedback

* Update submitted message color

* Update snapshots
2018-09-20 14:01:51 -04:00
Elias Nahum
46b6687d1f Show local notification when replying to PN fails (#2142) 2018-09-21 00:58:21 +08:00
Sudheer
5aac68e785 Change rn-fetch-blob to mock globally in jest (#2124) 2018-09-14 12:14:37 -03:00
Elias Nahum
48a311344c
Fix drawer stutter when jumping to a DM or joining a channel (#2113) 2018-09-13 16:27:45 -03:00
Sudheer
c6ea5e6024 MM-11603 Add a retry screen when fetching teams fails (#2085) 2018-09-06 20:35:50 -03:00
Saturnino Abril
320f1d9c91 fix email notification settings (#2051) 2018-08-29 14:25:09 -04:00
Elias Nahum
96e9c6c707 Update rn-fetch-blob and CBA support for iOS (#2033)
* Update rn-fetch-blob and CBA support for iOS

* remove trusty

* remove react-native-fast-image dependency
2018-08-29 14:01:37 -04:00
Saturnino Abril
669f0ea1cd use profile image from local after editing a profile image (#1990) 2018-08-16 06:57:23 -07:00
Elias Nahum
95ec582849
Fix session expired notification (#1986) 2018-08-09 08:29:38 -04:00
Harrison Healey
34a37cef05 MM-11477 Ensure client calls are wrapped with error handling (#1976) 2018-08-07 13:11:48 -04:00
Saturnino Abril
2fe9d8842a [MM-11492] Add protection in accessing ".team_id" field when it's immediately accessed after the object is created (#1963)
* add protection in accessing ".team_id" field when it's immediately accessed after the object is created.

* remove lastChannelId since lastChannel is being checked already
2018-08-03 10:52:43 -04:00
Saturnino Abril
3a70e5c43f add extra protection to those channel/object followed immediately by accessing its "channel_id" field (#1960) 2018-08-01 13:04:58 -04:00
Chris Duarte
26950abb61 Add deep linking support (#1805) 2018-07-31 08:43:54 -04:00
Elias Nahum
7e90c8ee06
Merge pull request #1908 from mattermost/release-1.10
merge Release 1.10 into master
2018-07-09 19:12:39 -04:00
Saturnino Abril
6458ed871b fix profile upload by using RNFetchBlob (#1900) 2018-07-09 18:32:09 -04:00
Elias Nahum
f157084ad2
Fix replying from push notification (#1894) 2018-07-09 14:59:19 -04:00
Saturnino Abril
0e692c2088 [MM-11004] Fix continuous channel loading (#1803)
* fix continuous channel loading

* revert change on limiting number of pages requested
2018-07-04 11:06:45 -04:00
Elias Nahum
dbb6f16e92
Fetch posts when receive push notifications as soon as possible (#1811) 2018-06-27 12:08:00 -04:00
Stan Chan
583d6b74ee Timezone feature (#1456)
* Add automatic and manual timezone support

Update users timezone and scrollTo selected timezone in SelectTimezone coponent

Clean styles for SelectTimezone screen

Add auto-timezone update when login or enter app

Hide timezone feature behind config

Fix requested changes

Parse SupportedTimezone from config

Add localTime and localized post stamps

Add trailing commas

Include all timezone util methods from redux

Remove EnableTimezoneSelection flag

WIP get timezones from server

Pull supportedTimezones from api

Minor fixes

Remove wrapWithPreventDoubleTap

Revert back to react-intl formatDate

Include timeZone prop in FormattedTime

Refactor Timezone row into component

Minor cosmetic changes

Add minimum server support for the timezone feature

Move getSupportedTimezones to componentWillMount

Move autoUpdateTimezone function to handleSuccessfulLogin

Specify user timezone in profile_header

Remove format props from FormattedTime

Add ExperimentalTimezone flag

Replace Client().getServerVersion() with entities.general.serverVersion

Add isTimezoneEnabled helper function

Move isMinimumServerVersion to utils/timezone.js

* Fix style errors

* Remove date-time-format-timezone polyfill

* Feedback changes

* Use timezone selector from redux

* Explicitly pass hour12 props to intl.formatDate

* Update package-lock

* Revert iOS project file changes

* Fix license header

* Include timezone related paths in modulePaths

* Fix license header

* Fix minor issue with rebasing

* Fix issue with getconfig in GeneralSettings

* Update package-lock
2018-06-27 06:55:03 -04:00
Elias Nahum
ba09fb9792 Sidebars improvement (#1787)
* Sidebars improvement
* Explicitly handle Android back button in code screen
* return null on getDerivedStateFromProps when no state changes needed
2018-06-26 01:17:53 +05:30
Elias Nahum
375c41dc3c
Merge branch 'release-1.9' 2018-06-25 15:31:46 -04:00
Elias Nahum
71e16afbb4 Fix bad action when tapping on a push notification (#1822) 2018-06-25 11:44:42 -04:00
Martin Kraft
3bde858a64 MM-10717: Update longpress buttons when add reaction, edit post, or d… (#1779)
* MM-10717: Update longpress buttons when add reaction, edit post, or delete post permissions change.

* MM-10717: Makes tooltip actions prop required.

* MM-10717: Switches all direct access of 'config' and 'license' to use selectors.
2018-06-21 08:43:17 -04:00
Jesse Hallam
8372e95d4a add eslint-plugin-header, and --fix all (#1726) 2018-06-19 19:14:50 -04:00
Harrison Healey
5aa4f6b6c9 MM-10815 Load more posts when post list is under 1 screen long (#1759) 2018-06-13 09:19:47 -04:00
Harrison Healey
b12d4cd91b MM-10823 Switch to default channel after leaving channel (#1743) 2018-06-07 17:13:29 -04:00
Harrison Healey
0910bef8ae MM-10372 Get channel if necessary when loading from push notification (#1730) 2018-06-05 15:37:44 -04:00
Chris Duarte
5604836a9d Save credentials immediately after login (#1703)
* Save credentials immediately after login

* Add mock app class to login.test.js
2018-05-25 09:21:18 -04:00
Elias Nahum
c171ae4809
Enable Android Unbundle strategy (perf part 2) (#1700)
* Enable Android Unbundle strategy

* feedback review

* Update modulePaths

* Add npm start and use it in the Makefile

* feedback review #2
2018-05-23 13:23:38 -04:00
Chris Duarte
4cebfdfd5d Fix issue where auto closed DMs would not show again (#1689)
* Fix issue where auto closed DMs would not show again

* Fix lint error

* Review feedback
2018-05-22 12:26:09 -04:00
Chris Duarte
e8712f9199 Cold startup js refactor (#1598)
* Switch to SingleDex and remove all locales

* WIP Mattermost Start Component for lazy loading modules

* Add files changed for native modules

* Add Entry component and app global object

* dispatch setStatusBarHeight for iOS

* Update screen imports

* Include Entry screen

* Refactor app to mattermost.android.js

* Override unnecessary java files

* Fix minor issues in changes

* Display empty state based on user credentials

Also, add proper background theme for empty loading screen

* Add native module constant cache support

* Fix startup theme regression

* Add Keychain support for credentials

* Fix Orientation regression

*  Fix SharedExtension regression

* Emit NATIVE_APP_LAUNCHED across bridge only once during cold start

* Add iOS Support

* Revert to previous implementation of i18n

* Fix styling issues

* Include listener for SERVER_VERSION_CHANGED

* Add SafeAreaView in Entry screen

* Register deviceToken early, in order to get iOS PN Support

* Include StartTimeModule

* Add ReplyFromPush support and remove NATIVE_APP_LAUNCHED listener

* Package native constants in StartTimeModule and avoid bridge calls

* Fix check-style errors

* Code cleanup

* Rename StartTimeModule to InitializationModule

* Remove NavigationApplication

* Documentation and minor changes

* Account for app opening after SharedExtension

* Refactor getIntl to getTranslations

* Move native module constants into it's own forked repos

* Include FetchBlob and DeviceInfo forked repos
2018-05-18 17:13:00 -04:00
Saturnino Abril
7863ebc588
Include "id" to data for UserTypes actions - RECEIVED_PROFILE_IN_CHANNEL (#1676)
* Include "id" to data for UserTypes actions - RECEIVED_PROFILE_IN_CHANNEL

* update commit of mattermost-redux
2018-05-16 05:21:00 +08:00
Chris Duarte
ad21a8cfb2 Add selectDefaultTeam (#1613) 2018-04-30 11:58:31 -03:00
Saturnino Abril
8a152ac1e7 convert test runner from mocha to jest (#1637) 2018-04-30 10:55:01 -04:00
Elias Nahum
7db7a311f1
MM-10300 Fix crash when leaving channel (#1606) 2018-04-24 08:01:55 -03:00
Elias Nahum
006c5a08d7
Use local Images when possible (#1580)
* Fix advance settings android layout

* include react-native-image-gallery dependency

* ImageCacheManager

* Add support for isGif, isDocument, isVideo and purge to file utils

* Remove file fetch cache

* include progressive image component

* Refactor image previewer

* Add image preview support for open graph and embed images

* Cache user profile picture

* Fix post additional content images for android

* Preview markdown inline images

* Improve progressive image

* feedback review
2018-04-13 12:23:15 -03:00
Chris Duarte
676a180067 Fix press username to mention (#1547)
* Fix press username press to mention

* Add cursorPosition to post_textbx state

* Remove unneeded draftSelectionChanged actions and events
2018-04-13 11:15:19 -04:00
Elias Nahum
e20b84c6d8 Upload progress indicator (#1562)
* Long post support

* Split file upload component

* Use fetch blob fork

* add progress to file upload

* Remove SERVER.PID from Makefile

* Preview only images

* remove unused prop
2018-04-04 09:14:26 -04:00
Saturnino Abril
8531212060 [MM-9516] Add feature to add user to channel after at-mention (#1521)
* add feature to add user to channel after at-mention

* update per comment and update mattermost-redux

* move sendAddToChannelEphemeralPost to actions folder

* rebase and fix merge conflicts, do clean up a bit
2018-03-26 13:20:13 -04:00
Elias Nahum
f85880d065
MM-9415 Fix convertion of heic to jpg (#1529) 2018-03-22 00:06:23 +02:00
enahum
d0d9103857 [MM-9374] Open Permalinks in app (#1449)
* [MM-9374] Open Permalinks in app

* Feedback review

* Upgrade mattermost-redux

* Fix eslint

* Navigation fixes

* Fixing style of merged lines
2018-03-07 14:48:31 +00:00
Jesse Hallam
58b72302d6 update eslint's comma-dangle rule to always-multiline (#1457)
* update eslint's `comma-dangle` rule to `always-multiline`

* add check and fix scripts to package.json

* Invoke `yarn fix` to adopt the updated eslint rules. No other changes are included.
2018-02-23 09:06:02 -05:00
Joram Wilander
84a2a0fab8
ABC-123 Add handling for loading custom emojis asynchronously (#1406)
* Add async handling of custom emoji to posts and channel info

* Add server request to emoji autocomplete

* Add custom emoji paging and server search to emoji picker

* Fix android

* Update mattermost-redux and revert temp change

* Backwards compatibility fixes

* Updates per feedback

* Set server version when user is not logged in

* Reset section index when search is cleared or cancelled

* Some small fixes and upgrade mattermost-redux

* Minor sorting changes
2018-02-15 17:38:45 -05:00
enahum
27c764d288 [ICU-579] Display Announcement banner (#1428)
* Announcement banner

* Feedback review
2018-02-13 10:23:11 -05:00
enahum
b53f3988b8 [ICU-680] Fix Duplicate posts (#1430) 2018-02-12 14:44:34 -05:00
enahum
d0f96c0887
[ICU-650] Upgrade React Native to 0.52.2 (#1421)
* Upgrade to React Native 0.52.2

* Bump app version to 1.7.0

* Update fastlane

* Upgrade mattermost redux

* feedback review
2018-02-07 18:24:01 -03:00
Stephen Kiers
29705d0715 ICU-573 Allow flag on file upload to trigger unescape of filename (#1383)
* properly encode filename to be handled by android

* Perf updates

* remove form-data devDependency

* Broke out encoding to function

* missed one

* Removed fontSize prop from Emoji

* trigger jenkins

* reverse jenkins trigger

* fix styles

* eslint upgrade

* Fine, harrison…

* needed semicolon now….
2018-01-31 11:42:02 -05:00
enahum
cd80cdfdf4 Fix race condition preventing the app opened from a PN to go to the correct channel (#1398)
* Fix race condition preventing the app opened from a PN to go to the correct channel

* Feedback review
2018-01-31 11:02:02 -05:00
Harrison Healey
a6d9632cad
ICU-562 Explicitly store whether or not 'load more posts' should be visible (#1379) 2018-01-26 11:29:28 -05:00
enahum
fff887bf85
Fix login after session expires or is revoked (#1360)
* Fix login after session expires or is revoked

* Feedback review

* Upgrade mattermost-redux
2018-01-18 08:26:46 -03:00
enahum
83e90596e3
Request data retention policies only when the user is logged in (#1351) 2018-01-15 17:08:56 -03:00
enahum
70c4e3e005
iOS Share Extension (#1308)
* objective-C share extension

* MattermostBucket module to share data between the main app and the extension

* middleware that shares the data between the main app and the extension

* Fix setState when safe area in unmounted

* Share extension for iOS

* Fastlane changes to include iOS share extension

* Fix unit test

* Feedback review

* define proptypes for icons
2018-01-15 16:11:42 -03:00
Chris Duarte
7860478d54 Fix notification replies for iOS (#1341)
* Fix notification replies for iOS

* Review feedback

* Review feedback 2
2018-01-15 13:59:25 -05:00
enahum
7cda6be8d7
Edit profile (#1322)
* Add set status feature

Small code refactoring

Add Do Not Disturb option

* Add Account Settings screen

Add username, nicname, and position fields

Add email field

get deviceHeight from redux

Clean up onPress handler in Settings

Refactor each account settings item to it's own component

Clean up email field and updateUser action method

Use mobile localization format in en.json

Update profile image

Clean up ProfilePicture for editing

Add loading and error components in AccountSettings

Refactor updateRequest state into a function

Follow design specs

Remove unnecessary this.state.emailUpdated

Polish AccountSettings and secondary components

Refactor AttachmentButton into it's own componentg

Add Account Settings icon in General Settings

Add TODO comments

* Update user status

* Edit Profile screen refactored

* Fix edit profile item text color
2018-01-08 14:18:57 -03:00
enahum
2181168c9f
Remove the possibility to post empty messages (#1317)
* Remove the possibility to post empty messages

* Fix userTyping action
2017-12-22 16:08:27 -03:00
enahum
5442bd5265
Fix uploading videos from Android (#1315)
* Fix uploading videos from Android

* Fix upload of gif files in iOS
2017-12-22 16:06:32 -03:00
enahum
bf4463b866
Previewer (#1246)
* Fix heic

* Change previwer to use the swiper instead a simple ScrollView
2017-12-04 12:20:10 -03:00
enahum
849c8cc4af
Clear failed images from post draft when posting (#1244)
* Clear failed images from post draft when posting

* feedback review

* clone files array only once in the failed reducer
2017-12-04 12:06:16 -03:00
Chris Duarte
322e63d7c4 Add fix for heic image uploads (#1222) 2017-11-28 17:43:36 -05:00
Chris Duarte
e6869dd760 Fix slash command for post comment (#1221) 2017-11-28 17:43:12 -05:00
enahum
ac2b38cb3b
Track analytics for start time, channel and team switching (#1192)
* Track analytics for start time, channel and team switching

* Update analytics to include currentUserId and ip 0.0.0.0

* Include diagnostic id with every segment request

* feedback review
2017-11-28 10:33:46 -03:00
enahum
6b4100d517
Add general util to handle actions that are forbidden (#1206) 2017-11-27 17:30:26 -03:00
enahum
b761872c59 Fix reset to channel view when push notification is tapped (#1201) 2017-11-23 18:48:50 -05:00
Chris Duarte
be682240f4 Add slash command support (#1190)
* Add slash command support

* Review feedback

* Review feedback 2

* Update to latest redux

* Fix tests
2017-11-23 14:25:03 -03:00
Chris Duarte
e345ee1e7b Add recently used section (#1136)
* Add recently used section and section icons

* Improve section scrolling indication

* Modify Makefile and use onMomentumScrollEnd

* Make sure top section maintains highlight when scrolled to top

* Sort emojis by startsWith then includes when filtering
2017-11-21 10:20:09 -05:00