r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity
1555 commits 4 branches 1 tag 27 MiB
Commit graph

804 commits

Author SHA1 Message Date
Andrew Nicolaou
7f78fda073 Fix sketch list padding in collection view 2019-09-25 12:07:18 -04:00
Andrew Nicolaou
7a1fa663af Edit sketch name/description 2019-09-25 12:07:18 -04:00
Andrew Nicolaou
60ec67804b Remove logging 2019-09-25 12:07:18 -04:00
Andrew Nicolaou
2a0a5601ee Display icon-based add/remove button in Collection List 2019-09-25 12:07:18 -04:00
Andrew Nicolaou
679304d0ab Do not empty table when fetching new data 2019-09-25 12:07:18 -04:00
Andrew Nicolaou
c288481476 Shorten date displayed in Collection List items for better layout 2019-09-25 12:07:18 -04:00
Andrew Nicolaou
20a5ac5ec3 Show toast message when creating collection or adding/removing sketches 2019-09-25 12:07:17 -04:00
Andrew Nicolaou
f98919e69b Logged in user can use "Add to collection" menu item 2019-09-25 12:07:17 -04:00
Andrew Nicolaou
959ff3ef20 Splits CollectionList into smaller files 2019-09-25 12:06:07 -04:00
Andrew Nicolaou
8781036ac7 WIP Display collection 2019-09-25 12:06:07 -04:00
Andrew Nicolaou
521e117d95 EditableInput component 2019-09-25 12:06:07 -04:00
Andrew Nicolaou
c57ead4c62 Create Collection 2019-09-25 12:06:07 -04:00
Andrew Nicolaou
6ca6e78a28 Displays existing collection 
- List all collections for a given user
- View an individual collection
- Link to a sketch from a collection
 2019-09-25 12:06:07 -04:00
Cassie Tarakajian
5c54983c24 add searchbar to sketches dashboard view, adjust sketch list and asset list styling to have sticky header 2019-09-24 17:52:45 -04:00
Cassie Tarakajian
5900e62904 unify navigation for authentication pages, add authorization to front end, fixes #650 2019-09-19 13:38:27 -04:00
Andrew Nicolaou
52e98723f5 Collection metadata area layout improvements 2019-09-18 09:10:10 +02:00
Andrew Nicolaou
a93ac48587 Enable collection and sketch to be created from dashboard page 2019-09-17 21:32:54 +02:00
Andrew Nicolaou
b980ec7854 Add sketch to collection from collection view 2019-09-17 20:48:37 +02:00
Andrew Nicolaou
709aa8eccb Fix sketch list padding in collection view 2019-09-16 23:13:20 +02:00
Andrew Nicolaou
8b058d8e56 Edit sketch name/description 2019-09-16 23:05:24 +02:00
Andrew Nicolaou
d2ec6864fb Remove logging 2019-09-16 21:57:32 +02:00
Andrew Nicolaou
5011c1f002 Display icon-based add/remove button in Collection List 2019-09-16 21:50:44 +02:00
Cassie Tarakajian
7f2529a973 merge master 2019-09-11 19:05:15 -04:00
Cassie Tarakajian
f09e743e92
Merge pull request #1143 from andrewn/feature/standalone-sketches 
Standalone sketches and asset page (fixes #1142)
 2019-09-11 16:52:39 -04:00
Andrew Nicolaou
a0384f166a Do not empty table when fetching new data 2019-09-11 21:13:34 +02:00
Andrew Nicolaou
125051ccb1 Use Nav with user menu in "dashboard" layout 2019-09-11 20:11:46 +02:00
Andrew Nicolaou
fef4bd8d71 Shorten date displayed in Collection List items for better layout 2019-09-11 20:06:08 +02:00
Andrew Nicolaou
c575559272 Show toast message when creating collection or adding/removing sketches 2019-09-09 18:53:54 +02:00
Andrew Nicolaou
55e6b3162d Logged in user can use "Add to collection" menu item 2019-09-09 18:53:21 +02:00
Andrew Nicolaou
3dbaa900a4 Splits CollectionList into smaller files 2019-09-09 18:52:14 +02:00
Andrew Nicolaou
2df3670dc4 WIP Display collection 2019-09-08 19:24:02 +02:00
Andrew Nicolaou
1c97152533 EditableInput component 2019-09-08 18:57:57 +02:00
Andrew Nicolaou
dcf65c6f46 Create Collection 2019-09-08 18:06:16 +02:00
Andrew Nicolaou
d02a413bf3 Displays existing collection 
- List all collections for a given user
- View an individual collection
- Link to a sketch from a collection
 2019-09-08 17:24:46 +02:00
Andrew Nicolaou
8ac95c0084 SketchList and AssetList set page title 2019-09-08 17:10:48 +02:00
Andrew Nicolaou
0ae7a9eebb Display Access Token tab depending on UI_ACCESS_TOKEN_ENABLED feature flag (#1149) 2019-09-08 16:45:59 +02:00
Andrew Nicolaou
7ea4ae5637 Fix linting errors and warnings 2019-09-08 16:43:16 +02:00
Cassie Tarakajian
a155e7638d
re #1153: fix bug in which login form was in invalid state if user had entered username or password incorrectly on the first try (#1155) 2019-09-06 13:30:06 -04:00
Andrew Nicolaou
162d5276f1 Display Access Token tab depending on UI_ACCESS_TOKEN_ENABLED feature flag (#1149) 2019-08-30 16:15:13 -04:00
Rick Brown
5695830361 add ability to toggle line numbers to accessibility settings. Fixes #1138 (#1146) 
* Added SET_LINE_NUMBERS constant

* Added setLineNumbers()

* Added lineNumber prop

* Added functionality to Preferences

* Passing props

* handle case SET_LINE_NUMBERS

* add lineNumber default value to the schema
 2019-08-30 12:36:34 -04:00
Cassie Tarakajian
8054a532d7
Update to webpack 4 (#1145) 
* remove some of the react errors, start to fix webpack HMR errors

* start upgrade to webpack 4

* more stuff to update webpack

* update webpack configs to work with webpack 4

* remove linting from truncate script
 2019-08-28 16:08:40 -04:00
Jon Paul Gualdarrama
68c1e48c99 Fix Issue #588. Only highlight runtime errors at the appropriate line… (#1136) 
* Fix Issue #588. Only highlight runtime errors at the appropriate line for file in which the error occurred.

* Modifications to handle js in html <script> tag Part 1

* Correctly highlight errors in JavaScript in a <script> tag
 2019-08-27 13:02:07 -04:00
Andrew Nicolaou
0193ee8297 Standalone sketch list and asset page 2019-08-24 13:37:55 +02:00
Andrew Nicolaou
1b461d33cf Do not set prevPath if navigation passes through skipSavingPath flag 2019-08-24 13:31:15 +02:00
Apoorv Taneja
aa318e0d2d fixed (#1141) 2019-08-22 16:47:22 -04:00
raclim
3d779734c3 Searchbar (#1132) 
* search bar function

* Fixes #231, adds searchbar to sketchlist

* Fixes #231, update requested changes to searchbar

* Fixes #231, reset search term after modal closed
 2019-08-21 14:08:08 -04:00
Apoorv Taneja
07a225c161 Fixed input field (#1130) 
* fixed

* fixed

* fixed
 2019-08-13 12:27:31 -04:00
Cassie Tarakajian
25151e76ee re: #524, slugify example titles so that they can have a permanent link 2019-08-09 13:07:56 -04:00
Cassie Tarakajian
8dada77ce5
fixes #1121, updates p5.js default to 0.9.0 (#1125) 2019-07-29 12:58:00 -04:00
Cassie Tarakajian
d64498ef1f
RE #168, Feature/asset totalsize limit (#1123) 
* re #168, add totalsize to response from API, add loader to asset list, add totalsize to asset list ui

* re #168, add totalsize to response from API, add loader to asset list, add totalsize to asset list ui

* update asset list copy to remove limit, since that's not implemented yet
 2019-07-24 12:55:58 -04:00
Apoorv Taneja
4c1ebdf83d Email Validation added (#1120) 
* changes

* changes

* changes

* changes

* changes
 2019-07-23 14:16:05 -04:00
Cassie Tarakajian
443232380c fix errors from rebase, again 2019-07-22 17:52:19 -04:00
siddhant
a851eda254 Add sorting to sketches #789 (#910) 
* reselect added

* Added Reselect Sorting

* Refactor App

* added svgs

* Refactor

* Fixed Issues

* re: #789, update sorting styling, create sorting actions and reducers, add sort by sketch name

* re #789, change names of svg icons

* re: #789, use orderBy instead of sortBy, fix styling jumps
 2019-07-22 17:34:26 -04:00
Vertmo
a10e0f0327 You can now generate keys from the advanced settings interface 2019-07-22 17:33:26 -04:00
Laksh Singla
bfef3e93dc Update sketch list styling (#819) 
* parent b3c3efcec9
author Laksh Singla <lakshsingla@gmail.com> 1549106083 +0530
committer Cassie Tarakajian <ctarakajian@gmail.com> 1560540243 -0400

parent b3c3efcec9
author Laksh Singla <lakshsingla@gmail.com> 1549106083 +0530
committer Cassie Tarakajian <ctarakajian@gmail.com> 1560540198 -0400

parent b3c3efcec9
author Laksh Singla <lakshsingla@gmail.com> 1549106083 +0530
committer Cassie Tarakajian <ctarakajian@gmail.com> 1560539667 -0400

Created initial html structure and styling for new SketchList design

Final styling of ActionDialogueBox commplete

Dropdown menu disappearing while clicking anywhere on the table

Fixed linting issues and renamed variables

Minor tweaks in the SketchList dropdown dialogue UI

Themifyed the dropdown

Made changes in the dropdown: Arrow positioned slightly updwards, Removed blank space and added box-shadow in dropdown, themifyed dropdowns dashed border color

Added Delete and Share functionality to Dialog box

Added Duplicate functionality to Dialog box

Added download functionality to Dialog box

SketchList does not open a sketch if dialogue box is opened

SketchList Rename initial UI completed

Enter key handled for rename project option

[WIP] Updating rename functionality

Download option now working for all the sketches

Duplicate functionality extended for non opened sketches too

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Dropdown closes when Share and Delete are closing for a more natural UX

fix broken files from rebasing

Created initial html structure and styling for new SketchList design

Final styling of ActionDialogueBox commplete

Added Delete and Share functionality to Dialog box

Added Duplicate functionality to Dialog box

[WIP] Updating rename functionality

Duplicate functionality extended for non opened sketches too

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Final styling of ActionDialogueBox commplete

Fixed linting issues and renamed variables

Minor tweaks in the SketchList dropdown dialogue UI

Themifyed the dropdown

Added Delete and Share functionality to Dialog box

[WIP] Updating rename functionality

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Dropdown closes when Share and Delete are closing for a more natural UX

fix broken files from rebasing

Final styling of ActionDialogueBox commplete

Minor tweaks in the SketchList dropdown dialogue UI

Themifyed the dropdown

[WIP] Updating rename functionality

Duplicate functionality extended for non opened sketches too

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Dropdown closes when Share and Delete are closing for a more natural UX

* fix bugs in merge commit

* move sketch list dialogue to ul/li

* update sketch option dropdown to use dropdown placeholder, remove unused css

* major refactor of sketchlist component, fix showShareModal action, minor updates ot icon sizing

* fix broken links on asset list

* remove unused image, fix options for different users in sketch list
 2019-07-22 17:32:55 -04:00
Cassie Tarakajian
ab7ecfc012 fix lingering errors from rebase 2019-07-22 17:22:36 -04:00
siddhant
d7837a62be Add sorting to sketches #789 (#910) 
* reselect added

* Added Reselect Sorting

* Refactor App

* added svgs

* Refactor

* Fixed Issues

* re: #789, update sorting styling, create sorting actions and reducers, add sort by sketch name

* re #789, change names of svg icons

* re: #789, use orderBy instead of sortBy, fix styling jumps
 2019-07-22 16:16:17 -04:00
Andrew Nicolaou
e77cbf4fa3 Changes API_KEY_REMOVED action constant to match API_KEY_CREATED 2019-07-22 16:14:51 -04:00
Vertmo
64caab0702 You can now generate keys from the advanced settings interface 2019-07-22 16:13:59 -04:00
Cassie Tarakajian
d4914983a4 prevent users from adding extension to folder name 2019-07-22 16:09:11 -04:00
Rachel Lim
1dd723cb9f for 989, updated folder cannot be renamed to empty string 2019-07-22 16:09:11 -04:00
Rachel Lim
b94ca8a52d for #989, files cannot be renamed to empty string 2019-07-22 16:09:11 -04:00
Laksh Singla
c3856480b8 Update sketch list styling (#819) 
* parent b3c3efcec9
author Laksh Singla <lakshsingla@gmail.com> 1549106083 +0530
committer Cassie Tarakajian <ctarakajian@gmail.com> 1560540243 -0400

parent b3c3efcec9
author Laksh Singla <lakshsingla@gmail.com> 1549106083 +0530
committer Cassie Tarakajian <ctarakajian@gmail.com> 1560540198 -0400

parent b3c3efcec9
author Laksh Singla <lakshsingla@gmail.com> 1549106083 +0530
committer Cassie Tarakajian <ctarakajian@gmail.com> 1560539667 -0400

Created initial html structure and styling for new SketchList design

Final styling of ActionDialogueBox commplete

Dropdown menu disappearing while clicking anywhere on the table

Fixed linting issues and renamed variables

Minor tweaks in the SketchList dropdown dialogue UI

Themifyed the dropdown

Made changes in the dropdown: Arrow positioned slightly updwards, Removed blank space and added box-shadow in dropdown, themifyed dropdowns dashed border color

Added Delete and Share functionality to Dialog box

Added Duplicate functionality to Dialog box

Added download functionality to Dialog box

SketchList does not open a sketch if dialogue box is opened

SketchList Rename initial UI completed

Enter key handled for rename project option

[WIP] Updating rename functionality

Download option now working for all the sketches

Duplicate functionality extended for non opened sketches too

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Dropdown closes when Share and Delete are closing for a more natural UX

fix broken files from rebasing

Created initial html structure and styling for new SketchList design

Final styling of ActionDialogueBox commplete

Added Delete and Share functionality to Dialog box

Added Duplicate functionality to Dialog box

[WIP] Updating rename functionality

Duplicate functionality extended for non opened sketches too

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Final styling of ActionDialogueBox commplete

Fixed linting issues and renamed variables

Minor tweaks in the SketchList dropdown dialogue UI

Themifyed the dropdown

Added Delete and Share functionality to Dialog box

[WIP] Updating rename functionality

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Dropdown closes when Share and Delete are closing for a more natural UX

fix broken files from rebasing

Final styling of ActionDialogueBox commplete

Minor tweaks in the SketchList dropdown dialogue UI

Themifyed the dropdown

[WIP] Updating rename functionality

Duplicate functionality extended for non opened sketches too

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Dropdown closes when Share and Delete are closing for a more natural UX

* fix bugs in merge commit

* move sketch list dialogue to ul/li

* update sketch option dropdown to use dropdown placeholder, remove unused css

* major refactor of sketchlist component, fix showShareModal action, minor updates ot icon sizing

* fix broken links on asset list

* remove unused image, fix options for different users in sketch list
 2019-07-22 16:09:11 -04:00
Cassie Tarakajian
0206148b65 fixes #924 (#1107) 2019-07-22 16:09:11 -04:00
Cassie Tarakajian
3c190874da re #389, update styling in sidebar and editor for icon consistency (#1104) 
* re #389, update styling in sidebar and editor for icon consistency

* re #389, remove link to unused icon
 2019-07-22 16:09:11 -04:00
Cassie Tarakajian
38e5022661 fixes #945 (#1102) 2019-07-22 16:07:37 -04:00
Cassie Tarakajian
cc456200a2 prevent users from adding extension to folder name 2019-07-17 12:33:23 -04:00
Rachel Lim
1e5a2b7c51 for 989, updated folder cannot be renamed to empty string 2019-07-17 12:33:23 -04:00
Rachel Lim
4861c03e36 for #989, files cannot be renamed to empty string 2019-07-17 12:33:23 -04:00
Laksh Singla
735adcfa05 Update sketch list styling (#819) 
* parent b3c3efcec9
author Laksh Singla <lakshsingla@gmail.com> 1549106083 +0530
committer Cassie Tarakajian <ctarakajian@gmail.com> 1560540243 -0400

parent b3c3efcec9
author Laksh Singla <lakshsingla@gmail.com> 1549106083 +0530
committer Cassie Tarakajian <ctarakajian@gmail.com> 1560540198 -0400

parent b3c3efcec9
author Laksh Singla <lakshsingla@gmail.com> 1549106083 +0530
committer Cassie Tarakajian <ctarakajian@gmail.com> 1560539667 -0400

Created initial html structure and styling for new SketchList design

Final styling of ActionDialogueBox commplete

Dropdown menu disappearing while clicking anywhere on the table

Fixed linting issues and renamed variables

Minor tweaks in the SketchList dropdown dialogue UI

Themifyed the dropdown

Made changes in the dropdown: Arrow positioned slightly updwards, Removed blank space and added box-shadow in dropdown, themifyed dropdowns dashed border color

Added Delete and Share functionality to Dialog box

Added Duplicate functionality to Dialog box

Added download functionality to Dialog box

SketchList does not open a sketch if dialogue box is opened

SketchList Rename initial UI completed

Enter key handled for rename project option

[WIP] Updating rename functionality

Download option now working for all the sketches

Duplicate functionality extended for non opened sketches too

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Dropdown closes when Share and Delete are closing for a more natural UX

fix broken files from rebasing

Created initial html structure and styling for new SketchList design

Final styling of ActionDialogueBox commplete

Added Delete and Share functionality to Dialog box

Added Duplicate functionality to Dialog box

[WIP] Updating rename functionality

Duplicate functionality extended for non opened sketches too

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Final styling of ActionDialogueBox commplete

Fixed linting issues and renamed variables

Minor tweaks in the SketchList dropdown dialogue UI

Themifyed the dropdown

Added Delete and Share functionality to Dialog box

[WIP] Updating rename functionality

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Dropdown closes when Share and Delete are closing for a more natural UX

fix broken files from rebasing

Final styling of ActionDialogueBox commplete

Minor tweaks in the SketchList dropdown dialogue UI

Themifyed the dropdown

[WIP] Updating rename functionality

Duplicate functionality extended for non opened sketches too

Modified overlay behaviour to close only the last overlay

Share modal can now display different projects

Dropdown closes when Share and Delete are closing for a more natural UX

* fix bugs in merge commit

* move sketch list dialogue to ul/li

* update sketch option dropdown to use dropdown placeholder, remove unused css

* major refactor of sketchlist component, fix showShareModal action, minor updates ot icon sizing

* fix broken links on asset list

* remove unused image, fix options for different users in sketch list
 2019-06-19 16:21:25 -04:00
Cassie Tarakajian
4bd081b307
fixes #924 (#1107) 2019-06-18 16:54:16 -04:00
Cassie Tarakajian
b3c3efcec9
re #389, update styling in sidebar and editor for icon consistency (#1104) 
* re #389, update styling in sidebar and editor for icon consistency

* re #389, remove link to unused icon
 2019-06-14 13:30:13 -04:00
Cassie Tarakajian
0b24938dce
fixes #945 (#1102) 2019-06-12 17:11:35 -04:00
Andrew Nicolaou
528f57ad0c Removes the createProject IDE action as it's not used (#1097) 2019-06-11 17:47:14 -04:00
siddhant
8caeb0d439 Add sorting to sketches #789 (#910) 
* reselect added

* Added Reselect Sorting

* Refactor App

* added svgs

* Refactor

* Fixed Issues

* re: #789, update sorting styling, create sorting actions and reducers, add sort by sketch name

* re #789, change names of svg icons

* re: #789, use orderBy instead of sortBy, fix styling jumps
 2019-06-11 17:47:14 -04:00
Cassie Tarakajian
6f1b6fd51c for #950, update babel to v7 (#1077) 
* for #950, upgrade babel to v7

* fix linting errors

* for #950, remove @babel/core from devDependencies (so it's only in dependencies) and change babel-loader config to use .babelrc

* for #950, changes to .babelrc to make  work

* for #950, include core-js modules in webpack config for IE support with babel/plugin-syntax-dynamic-import

* for #950, update babel and associated packages to LTS
 2019-06-11 17:47:14 -04:00
Andrew Nicolaou
60a3197621 Removes the createProject IDE action as it's not used (#1097) 2019-06-11 17:29:42 -04:00
Andrew Nicolaou
4679d6a0bd Show "Back to the editor" in nav on Account view page 2019-06-11 16:24:26 -04:00
Andrew Nicolaou
eb4846c3c2 Fix layout on user pages 2019-06-11 16:24:26 -04:00
Andrew Nicolaou
1f95718f58 Page background matches selected theme for user pages 2019-06-11 16:24:26 -04:00
Andrew Nicolaou
b16cb26a4b Makes Account view a modal 2019-06-11 16:24:26 -04:00
Andrew Nicolaou
2854aa9235 Extracts tabs into reusable CSS 2019-06-11 16:24:26 -04:00
Andrew Nicolaou
5e74be46fd Adds theme-aware CSS for "user" pages 2019-06-11 16:24:26 -04:00
siddhant
b7df80a96c Add sorting to sketches #789 (#910) 
* reselect added

* Added Reselect Sorting

* Refactor App

* added svgs

* Refactor

* Fixed Issues

* re: #789, update sorting styling, create sorting actions and reducers, add sort by sketch name

* re #789, change names of svg icons

* re: #789, use orderBy instead of sortBy, fix styling jumps
 2019-06-06 17:17:33 -04:00
Cassie Tarakajian
18f646bde9
for #950, update babel to v7 (#1077) 
* for #950, upgrade babel to v7

* fix linting errors

* for #950, remove @babel/core from devDependencies (so it's only in dependencies) and change babel-loader config to use .babelrc

* for #950, changes to .babelrc to make  work

* for #950, include core-js modules in webpack config for IE support with babel/plugin-syntax-dynamic-import

* for #950, update babel and associated packages to LTS
 2019-06-05 12:05:31 -04:00
Cassie Tarakajian
b41b3538b9 fixes #417, add default p5.js inclusion to non-minified version, and update default p5.js version to latest (#1084) 2019-05-29 17:29:53 -04:00
Andrew Nicolaou
693542eef5 Forces light theme on Account page 
This is until this page's components are made theme-aware
 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
fe513fdb54 Adds spacing around social login button 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
34fea139f2 Fixes Account back behaviour 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
3cedf37647 Changes API_KEY_REMOVED action constant to match API_KEY_CREATED 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
c508765310 Fixes linting errors 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
89dd41d81f lastUserAt should be null if the key has never been used 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
3e760ca0b8 Styles Account and APIKeys components 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
a03eed1603 Copy button copies token to clipboard 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
ed87d4cd26 Aligns AccountView to top of page 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
504eacaf64 Displays all API keys in a table, including new token information 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
de5e1a9e8f Removes AdvancedSettingsView as functionality now in AccountView 2019-05-29 12:51:50 -04:00
Andrew Nicolaou
90f34d7a5a Updates client UI to request token generation from server 2019-05-29 12:51:50 -04:00
Vertmo
3b55ff81d2 Hashing keys before storing them 2019-05-29 12:51:50 -04:00
Vertmo
78695d3983 Improved interface for copying key after creation 2019-05-29 12:51:50 -04:00