Commit Graph

310 Commits

Author SHA1 Message Date
mgabdev
34f6a1ab5b Progress
new MediaAttachment video style :playable for mp4 to make videojs work with multiple files, hiding albums, hiding bookmark collections. may need tweaks on mediaattachment for mov and other formats : todo :
2020-12-22 12:11:22 -05:00
mgabdev
6fbea0a59e Progress on little important things
removing .mov for now until we can figure out solution with videojs, added model to track username changes, got chat creation flow down, progress on bookmark collections, albums, filtering blocks/mutes from group, explore, collection timelines
2020-12-22 01:36:38 -05:00
mgabdev
67d94858dc Progress
hashtag in top of tag feed, scroll to comment, chat blocking, muting, filtering
2020-12-21 18:30:46 -05:00
mgabdev
ee91809e8d Progress
Albums almost done, group, chat moderation, photo, video page updates
2020-12-21 13:25:05 -05:00
mgabdev
1a8ecc672c Progress on group account search
Added group member search, group removed account, album add styles
2020-12-20 19:28:32 -05:00
mgabdev
67eb9d5890 Progress
Report modal style fix, chat updates, statusserializer revert, display name truncation
2020-12-20 12:27:24 -05:00
mgabdev
7ec426e3d8 Progress on DMs
Progress on DMs
2020-12-19 01:33:33 -05:00
mgabdev
47cd60f851 Progress
added composer query string functionality for url, text. fixed issue with no user in base_controller, cleaned up video component, albums starting
2020-12-17 23:46:37 -05:00
mgabdev
5a37a7090e Progress
accounts approved, video player testing, bookmark collections
2020-12-17 01:34:00 -05:00
mgabdev
8f94ffad9c Progress 2020-12-16 02:39:07 -05:00
mgabdev
d1ff39bb81 Fixed issues 2020-12-15 19:44:01 -05:00
mgabdev
75d52c841e Progress 2020-12-15 19:31:30 -05:00
mgabdev
de0c977950 Progress on deck, dms 2020-12-10 11:51:45 -05:00
mgabdev
6c13144fbc Progress 2020-12-09 15:02:43 -05:00
mgabdev
586935f07f Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/removing_ruby_junk 2020-12-09 00:00:35 -05:00
mgabdev
c18991f174 Added LinkBlock functionality in admin
• Added:
- LinkBlock functionality in admin
2020-12-08 23:19:10 -05:00
mgabdev
ba8e8942dc Added Gab Deck initial mvp
• Added:
- Gab Deck initial mvp
2020-12-05 23:47:48 -05:00
mgabdev
2f798ca1bd Added toggle option for Application superapp in admin settings
• Added:
- toggle option for Application superapp in admin settings
2020-12-04 12:28:32 -05:00
mgabdev
f6a7422704 Progress on DMs responsiveness
Progress on DMs responsiveness
2020-12-03 22:27:09 -05:00
mgabdev
137a36b810 Progress with DMs
Progress with DMs
2020-12-03 17:13:11 -05:00
mgabdev
9a43c51085 Progress on dms, code cleanup
Progress on dms, code cleanup
2020-12-02 23:22:51 -05:00
mgabdev
20d4fc09af Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/removing_ruby_junk 2020-11-25 16:43:09 -06:00
mgabdev
b4e370d3d3 Commiting 2020-11-25 15:22:37 -06:00
Fosco Marotto
b81b6ad1c2 [Lists] Add a 10 day limit to list query 2020-11-20 21:30:03 -08:00
Fosco Marotto
0af28e9b0a [Lists] Fix lists query 2020-11-20 21:14:33 -08:00
Fosco Marotto
62e8f846bc [Lists] Change data source and query method 2020-11-20 21:04:41 -08:00
Fosco Marotto
3fcf7fee0d [group_collection_controller] add 7 day date constraint to main query. 2020-11-20 16:37:37 -08:00
mgabdev
fb612f60c8 Commiting 2020-11-15 12:48:32 -06:00
mgabdev
1ef59c2266 Updates to fixes for deploy
• Updates:
- to fixes for deploy
2020-11-09 16:19:04 -06:00
mgabdev
6f8a1c012d Fixed issue in PopularLinksController with top links
• Fixed:
- issue in PopularLinksController with top links
2020-11-09 14:29:34 -06:00
mgabdev
10219345f7 Updated PopularLinksController
• Updated:
- PopularLinksController
2020-11-09 14:02:44 -06:00
mgabdev
21937d9e09 Added promotions to redux and added selector for setting promotions if not PRO
• Added:
- promotions to redux
- selector for setting promotions if not PRO

• Updated:
- StatusList, SidebarPanelGroup to use promotions from redux
2020-11-09 13:28:43 -06:00
mgabdev
a62de51b78 Removed unused api TrendsController from ruby
• Removed:
- unused api TrendsController from ruby
2020-11-09 12:33:28 -06:00
mgabdev
c0d3d1d6c4 Removed unused activitypub controllers from ruby
• Removed:
- unused activitypub controllers from ruby
2020-11-09 12:32:34 -06:00
mgabdev
d7cc2419a6 Removed unused DirectController for timelines from ruby
• Removed:
- unused DirectController for timelines from ruby
2020-11-09 12:31:24 -06:00
mgabdev
e5f68c3c55 Removed unused Instances api routes from ruby
• Removed:
- unused Instances api routes from ruby
2020-11-09 12:30:54 -06:00
mgabdev
cf7b554d69 Removed unused well_known routes from ruby
• Removed:
- unused well_known routes from ruby
2020-11-09 12:29:35 -06:00
mgabdev
0526e546c9 Removed unused ActivityPub workers in status PinsController
• Removed:
- unused ActivityPub workers in status PinsController
2020-11-09 12:28:36 -06:00
mgabdev
bfd1e1ef9d Removed unused GifsController
• Removed:
- unused GifsController
2020-11-09 12:15:57 -06:00
mgabdev
b0e3d611f5 Removed unused code from initial_state and ReactController
• Removed:
- unused code from initial_state and ReactController
2020-11-09 12:14:42 -06:00
mgabdev
83006eed39 Updated EmptyController to have protections and error responses
• Updated:
- EmptyController to have protections and error responses
2020-11-09 12:10:11 -06:00
mgabdev
297fac5d21 Updated some controllers to inherit from EmptyController
• Updated:
- some controllers to inherit from EmptyController
2020-11-09 12:08:31 -06:00
mgabdev
7027cd0bf4 Added EmptyController in ruby
• Added:
- EmptyController in ruby
2020-11-09 12:05:35 -06:00
mgabdev
f175b640f0 Updated news, trends image url path in redux
• Updated:
- news, trends image url path in redux
2020-11-09 12:00:37 -06:00
mgabdev
380042cb7a Updated GabTrendsController to be disabled on prod
• Updated:
- GabTrendsController to be disabled on prod
2020-11-09 01:30:27 -06:00
mgabdev
6afa8b1f35 Added PopularLinks controller
• Added:
- PopularLinks controller to fetch popular links, most recent 2 gabs from `@gab`

• Todo:
- Clean up code, store results in redis for time
- Add top video/links
2020-11-06 23:24:16 -06:00
mgabdev
ae0132663c Added test params in GabTrendsController for local, dev envs
• Added:
- test params in GabTrendsController for local, dev envs
2020-11-06 23:23:18 -06:00
mgabdev
04cf1ad7ce Added a few route matches in ReactController
• Added:
- a few route matches in ReactController
2020-10-30 12:56:03 -05:00
mgabdev
f129d9c49b Added LinkTimeline and PreviewCard fetching by id
• Added:
- LinkTimeline and PreviewCard fetching by id
2020-10-29 18:46:54 -05:00
mgabdev
acc956777e Updated applications, development admin settings to be staff only
• Updated:
- applications, development admin settings to be staff only
2020-10-28 23:09:53 -05:00
mgabdev
3c07e9d63b Added new security question to sign up, Added notification for unconfirmed emails
• Added:
- new security question to sign up
- notification for unconfirmed emails
- modal for describing issue with Gab emails
2020-10-16 16:25:37 -05:00
mgabdev
33369c5fbf Added authorization to pin group statuses
• Added:
- authorization to pin group statuses
2020-10-06 19:46:30 -04:00
mgabdev
65c5ee56f9 Updated GroupsController, groups reducer to work with browsing by category, tag
• Updated:
- GroupsController, groups reducer to work with browsing by category, tag
2020-09-24 16:21:16 -05:00
mgabdev
8f57514bc8 Fixed issue with group fetching, serializer for loading password
• Fixed:
- issue with group fetching, serializer for loading password for admin only
2020-09-17 18:21:58 -05:00
mgabdev
a842bfb20b Fixes for news and injection links
• Fixes:
- for news and injection links
2020-09-14 22:16:21 -05:00
mgabdev
12c9cf2083 Updated explore page functionality
• Updated:
- explore page functionality
2020-09-14 20:20:27 -05:00
mgabdev
fafd1ef658 Added pages and routes for Groups by tag and category
• Added:
- pages and routes for Groups by tag and category
2020-09-14 17:12:45 -05:00
mgabdev
41f48ea886 Added checks for status visiblity if group is private
• Added:
- checks for status visiblity if group is private
2020-09-14 11:12:25 -05:00
mgabdev
6d85c76c8f Added ability to set password for groups
• Added:
- ability to set password for groups
- GroupPasswordModal
- checks for if has password
- rate limiting in rack_attack
2020-09-11 17:27:00 -05:00
mgabdev
1baa123e25 Added includes for GroupCategory in GroupController set_group
• Added:
- includes for GroupCategory in GroupController set_group
2020-09-11 17:23:13 -05:00
mgabdev
8c4f4899e7 Updated functionality for group join requests approve, reject, leave
• Updated:
- functionality for group join requests approve, reject, leave
2020-09-11 17:22:33 -05:00
mgabdev
6e17b7c17b Updated GroupCategory functionality with Groups
• Updated:
- GroupCategory functionality with Groups
2020-09-10 17:12:43 -05:00
mgabdev
217aab9faa Added join requests to Groups
• Added:
- join requests to Groups
- redux actions, reducers
- controller and functionality for fetching join requests, accepting, rejecting join requests
2020-09-10 17:07:00 -05:00
mgabdev
d3355f8bd5 Added suggestions page Updated SuggestionsController with unlimited param
• Added:
- suggestions page in app

• Updated:
- SuggestionsController with unlimited param to show max 80 items
2020-09-10 16:21:20 -05:00
mgabdev
d030783089 Added GroupPinnedStatuses
• Added:
- GroupPinnedStatuses
- controllers for timeline, creation, deletion
- redux actions, reducers for creation, deletion
- timeline fetching in timelines action
- options to pin, unpin in status options popover for group admin
2020-09-10 15:07:01 -05:00
mgabdev
c43d1d38de Fixed issue in TagController
• Fixed:
- issue in TagController
2020-08-19 17:46:49 -05:00
mgabdev
7e81b2e132 Updates to controllers
• Updates:
- to controllers
2020-08-19 17:34:17 -05:00
mgabdev
5fc517473f Removed limits for pagination in GroupCollectionController, GroupTimeline controller
• Removed:
- limits for pagination in GroupCollectionController, GroupTimeline controller
2020-08-12 17:40:46 -05:00
mgabdev
b353c835af Updated GroupCollectionTimeline, GroupTimeline to insert pagingation headers only if min is met
• Updated:
- GroupCollectionTimeline, GroupTimeline to insert pagingation headers only if min is met
2020-08-10 22:22:08 -05:00
mgabdev
d3e55d28c4 Updated GroupCollectionTimeline, GroupTimeilne newest to only last 14 days
• Updated:
- GroupCollectionTimeline, GroupTimeilne newest to only last 14 days
2020-08-10 22:16:33 -05:00
mgabdev
b2c69afdbd Added new sorting for "Hot" in GroupCollection, GroupTimeline
• Added:
- new sorting for "Hot" in GroupCollection, GroupTimeline
2020-08-10 22:16:08 -05:00
mgabdev
4a8cd0b585 Updates to groups sorting
• Updates to groups sorting
2020-08-08 13:08:48 -05:00
mgabdev
a4c6b5639d Updated sorting in groups controllers
• Updated:
- sorting in groups controllers
2020-08-07 17:26:14 -05:00
mgabdev
90dc47a61b Updated GroupCollectionController to have sorting v1 for logged-in users
• Updated:
- GroupCollectionController to have sorting v1 for logged-in users
2020-08-06 23:20:48 -05:00
mgabdev
083a864be3 Updated GroupCategoriesController to require user
• Updated:
- GroupCategoriesController to require user
2020-08-06 23:13:20 -05:00
mgabdev
f964950282 Removed react/home.html.haml
• Removed:
- react/home.html.haml
2020-08-06 23:10:22 -05:00
mgabdev
516b7852b8 Added search filter for isVerified accounts
• Added:
- search filter for isVerified accounts

• Todo:
- Implement in account search query
2020-08-06 23:05:02 -05:00
mgabdev
bffc202270 Updated routes to have root point to react
• Updated:
- routes to have root point to react
2020-08-06 00:20:28 -05:00
mgabdev
7d4ff8df63 Upated GroupController, Removed GroupQueryService
• Upated:
- GroupController

• Removed:
- GroupQueryService
2020-08-06 00:15:47 -05:00
mgabdev
2e286784c1 Updated GroupController permitted params
• Updated:
- GroupController permitted params
2020-08-06 00:08:06 -05:00
mgabdev
805e9a0471 Added GroupCollection timeline, redux, streaming, routes
• Added:
- GroupCollection timeline, redux, streaming, routes
2020-08-06 00:07:46 -05:00
mgabdev
c20f7adf6a Added GroupCategories API route and controller
• Added:
- GroupCategories API route and controller
2020-08-05 23:12:17 -05:00
mgabdev
7dd1e0cd0b Added group_categories creation page in admin panel
• Added:
- group_categories creation page in admin panel
2020-08-05 23:03:14 -05:00
mgabdev
043fc01cea Added self-destructing/expiring statuses
• Added:
- self-destructing/expiring statuses for GabPRO members only
- ExpiringStatusWorker
- stopwatch icon
- expires_at redux values
- expires_at button in composer
- expires at selection popover

• Updated:
- Schedule status button to not show if expiring status active
2020-07-24 19:05:31 -05:00
mgabdev
13af58da7a Added bookmarks
• Added:
- bookmarks for GabPRO members only
- migration for creation of StatusBookmarks
- all necessary routes, controllers
- redux for adding, removing, fetching and displaying bookmarks
- bookmark icon
- doorkeeper scopes
- backend and frontend support

Bookmarks behave like likes/favorites, except they aren't shared with other users and do not have an associated counter.

dfea7368c9
2020-07-24 18:48:31 -05:00
mgabdev
3b0ec6a270 Updated groups to be public
• Updated:
- groups to be public
- routes for /group and /groups/id to be public
- GroupTimeline to ignore relationships for loading
- Group fetching to be a where with is_archived: false
- GroupControllers to have if current_user, else

• Added:
- Meta and og information for view
- Group fetch
- public route api for featured groups, group timelines

• Removed:
- Doorkeeper for read:groups
2020-07-21 23:05:54 -05:00
mgabdev
f92f75d747 Added shortcuts
• Added:
- shortcuts functionality
- shortcuts route, controller, model
- shortcut error message for "exists"
- shortcut redux
- EditShortcutsModal, constant
- links to sidebar, sidebar_xs
- options to add/remove group, account in GroupOptionsPopover, ProfileOptionsPopover
- shortcuts page, feature/list
2020-07-21 22:24:26 -05:00
mgabdev
5967a6a34c Removed unused @body_classes in ruby
• Removed:
- unused @body_classes in ruby
2020-07-21 16:51:39 -05:00
mgabdev
de834cd586 Updated Introduction/onboarding flow
• Updated:
- Introduction/onboarding flow

• Added:
- autoJoinGroup to default "Introduce Yourself" group in gab.com if you post the welcome post in introduction last slide
2020-07-14 22:31:54 -05:00
mgabdev
b26cd650c6 Removed welcome from routes in react controller
• Removed:
- welcome from routes in react controller
2020-07-14 18:45:11 -05:00
mgabdev
73b68373a1 Updated ReactController to have new array of public_route_matches
• Updated:
- ReactController to have new array of public_route_matches for about, search, explore pages
2020-07-10 15:17:53 -05:00
mgabdev
a9c90487aa Removed unused current_theme variables in ruby application
• Removed:
- unused current_theme variables in ruby application
2020-07-10 13:26:24 -05:00
mgabdev
50714c41be Removed unused class app-body from react app container
• Removed:
- unused class app-body from react app container
2020-07-10 13:24:09 -05:00
mgabdev
7548b1ea47 Updated GabTrendsController, ShopController APIs to have logs and reorder returns
• Updated:
- GabTrendsController, ShopController APIs to have logs and reorder returns
2020-07-08 18:35:42 -05:00
mgabdev
22c0957752 Added new check for GabTrendsController, ShopController for empty
• Added:
- new check for GabTrendsController, ShopController for empty
2020-07-08 17:41:48 -05:00
mgabdev
0fdf762815 Updated GabTrendsController, ShopController to use Request instead of Net
• Updated:
- GabTrendsController, ShopController to use Request instead of Net
2020-07-07 16:01:51 -05:00
mgabdev
2ae611d7ed Updated featured groups to max 100
• Updated:
- featured groups to max 100
2020-07-07 16:01:27 -05:00
mgabdev
7087926a9c Updated GabTrendsController feed redis key
• Updated:
- GabTrendsController feed redis key
2020-07-06 15:15:28 -05:00
mgabdev
f3b57b5810 Added Explore page with Gab Trends partner data
• Added:
- Explore page with Gab Trends partner data
2020-07-01 22:39:43 -04:00
mgabdev
bc2eeee497 Added pro feed
• Added:
- pro feed
2020-07-01 21:40:00 -04:00
mgabdev
f41274efc7 Added verified accounts/suggestions panel, updated suggestions route
• Added:
- verified accounts/suggestions panel

• Updated:
- suggestions route
2020-07-01 21:36:53 -04:00
mgabdev
095e646661 Added ShopPanel to home sidebar
• Added:
- ShopPanel to home sidebar
- DIssenter shop redux, api route/controller
2020-07-01 21:33:10 -04:00
mgabdev
7ad7fe06bd Removed public/community timeline for non-admins
• Removed:
- public/community timeline for non-admins
- links to the page
- web sockets for the page
2020-06-19 15:42:13 -04:00
mgabdev
f7e0528d3b Merge branch 'feature/rich_text_editor' of https://code.gab.com/gab/social/gab-social into develop 2020-06-17 16:45:45 -04:00
mgabdev
1a506327db Rich Text Editor (WIP) x3 2020-06-17 13:25:10 -04:00
mgabdev
9d61659604 Updated store_location_for for redirecting after sign in
• Updated:
- store_location_for for redirecting after sign in
2020-06-16 09:31:55 -04:00
mgabdev
5c96fad17a Fixed issues with routing/urls for log in
• Fixed:
- issues with routing/urls for log in
2020-06-15 16:37:45 -04:00
mgabdev
eb89d552ce Fixed issue with Tags timeline
• Fixed:
- issue with Tags timeline and incorrect number of arguments due to removal of "local" attribute
2020-06-11 15:33:56 -04:00
mgabdev
4a23c62ec8 Updated Gab Trends api, redux, panel
• Updated:
- Gab Trends api, redux, panel
- GabTrendsController takes in query string for feed type
2020-06-08 22:10:51 -04:00
mgabdev
a5e99dd7c3 Added unique photos and videos tab to profile
• Added:
- unique photos and videos tab to profile
- mediaType/media_type query string in api/statuses_controller

• Updated:
- /media to redirect to /photos
- AccountGallery, selector to accept mediaType and update on change in componentWillReceiveProps

• Removed:
- Generic "media" tab

• Todo:
- Create index for MediaAttachment.type
2020-06-08 19:38:36 -04:00
mgabdev
985e1458d5 Removed unused/old/pre-refactor settings
•Removed:
- unused/old/pre-refactor settings
2020-06-07 14:01:54 -04:00
mgabdev
b7e24f4245 Updated status.rb scopes and api public timline controller to be always local only
• Updated:
- status.rb scopes and api public timline controller to be always local only
2020-06-06 16:25:07 -04:00
mgabdev
f7a0b022d4 Update activity pub jobs
• Update:
- activity pub jobs to retry 0 and dead: true

• Remove:
- ActivityPub DeliveryWorker on account suspension
- Inbox, outbox, collections routes
2020-05-29 13:01:35 -04:00
mgabdev
294883da56 Updated instance api endpoints to return empty
• Updated:
- instance api endpoints to return empty, /api/v1/instance /api/v1/instance/peers /api/v1/instance/activity
2020-05-27 13:09:04 -04:00
mgabdev
8d6d85f829 Update account, status meta tags
• Update:
- account, status meta tags
2020-05-26 20:12:19 -04:00
mgabdev
6f8416de68 Removed custom_css setting
• Removed:
- custom_css setting, controller, locales
2020-05-26 00:56:11 -04:00
mgabdev
2346ef25ce Updated public and tag timline controllers to require user
• Updated:
- public and tag timline controllers to require user
2020-05-25 21:06:04 -04:00
mgabdev
ec499eb1b8 Updated .well-known routes
• Updated:
- .well-known routes
2020-05-25 21:04:40 -04:00
mgabdev
046a126d1d revert 9d8b96cb3 2020-05-22 17:18:15 -04:00
mgabdev
8b020cf47f revert d72cd96a3, 1948972a4 2020-05-22 17:05:40 -04:00
mgabdev
1948972a4f TESTING - Disable home, notifications api timelines - 2 2020-05-22 14:47:02 -04:00
mgabdev
d72cd96a32 TESTING - Disable home, notifications api timelines - 1 2020-05-22 14:45:50 -04:00
mgabdev
83d739e57d revert 5e113bafc 2020-05-22 14:45:31 -04:00
mgabdev
5e113bafc0 TESTING - Disable all api queries 2020-05-22 14:07:23 -04:00
mgabdev
9d8b96cb36 TESTING - All timeline - 1
Returning empty
2020-05-22 13:45:04 -04:00
mgabdev
08a09ccc4f Updated home_timeline default status limit on initial load
• Updated:
- home_timeline default status limit on initial load to 10, all other times limit is 20
2020-05-22 00:05:17 -04:00
mgabdev
df1ddd8a45 Updated DEFAULT_NOTIFICATIONS_LIMIT to 20
• Updated:
- DEFAULT_NOTIFICATIONS_LIMIT to 20 (original)
2020-05-21 14:49:44 -04:00
mgabdev
04b9807d52 Updated DEFAULT_STATUSES_LIMIT to 20 2020-05-15 01:33:49 -04:00
mgabdev
bb0182c1e1 pull 2020-05-11 23:34:18 -04:00
mgabdev
498f163880 Progress 2020-05-04 14:44:37 -04:00
mgabdev
4cf0713b37 Don't require user to embed
Fixes #80
2020-05-03 14:59:59 -04:00
mgabdev
055b5a430f progress 2020-05-03 01:22:49 -04:00
mgabdev
196a906cec Progress 2020-05-02 02:25:55 -04:00
mgabdev
fe9a89d68c Revert 2020-05-01 12:46:31 -04:00
mgabdev
50dad82aae Pulled
6e9e8d89fa
2020-04-30 12:33:41 -04:00
mgabdev
8673eb8975 Progress 2020-04-30 00:34:50 -04:00
mgabdev
c3d0d8bde2 Progress 2020-04-28 01:33:58 -04:00
mgabdev
fed036be08 Progress 2020-04-22 01:00:11 -04:00
mgabdev
4d7aee59c9 Progress 2020-04-17 01:35:46 -04:00
mgabdev
595208780e Progress 2020-04-11 18:29:19 -04:00
mgabdev
e485e2f955 Progress 2020-04-03 19:18:26 -04:00
mgabdev
0a89c7b775 Grouped notifications (v1) 2020-04-02 21:05:49 -04:00
mgabdev
416bc3d603 Progress 2020-04-02 12:57:04 -04:00
mgabdev
d79133c72d Progress 2020-04-02 00:07:47 -04:00
mgabdev
80d41b8d94 Progress 2020-04-01 23:17:21 -04:00
mgabdev
0532890c0e Removed featured tags
We don't use
2020-03-27 18:05:16 -04:00
Alex Gleason
d78dd971c0
Fix unlike counter, fixes #107 2020-03-13 13:44:44 -05:00
Alex Gleason
316b5c8d0f
Merge remote-tracking branch 'upstream/develop' into feature/frontend_refactor 2020-03-10 16:24:43 -05:00
mgabdev
0df3c073a5 Progress 2020-03-02 17:26:25 -05:00
Alex Gleason
a925509384
Clean up ReactController 2020-02-21 14:23:08 -06:00