vmario/wisemapping-frontend
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-frontend.git synced 2024-11-30 01:24:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,025 Commits 5 Branches 13 Tags 213 MiB
9e43b9953e
Commit Graph

899 Commits

Author SHA1 Message Date
Paulo Gustavo Veiga
511b5ab809 Toolbar changed to flat black 2021-12-28 14:20:09 -08:00
Paulo Gustavo Veiga
9cae64b8c0 Add more incon images 2021-12-28 14:12:38 -08:00
Paulo Gustavo Veiga
2f6164a611 v0.4.6 2021-12-27 23:30:12 -08:00
Paulo Gustavo Veiga
c72ac36716 Move note and link to icon folder 2021-12-27 23:10:56 -08:00
Paulo Gustavo Veiga
dc0a4648c5 Update toolbar images to material. 2021-12-27 23:00:06 -08:00
Paulo Gustavo Veiga
998f9d33a9 Add new incons 2021-12-27 18:55:44 -08:00
Paulo Gustavo Veiga
d2396fcb95 Merge branch 'feature/svg_icons' into develop 2021-12-27 12:34:31 -08:00
Paulo Gustavo Veiga
d4d8bbc121 Fix alignment and test 2021-12-27 12:33:44 -08:00
Paulo Gustavo Veiga
db4052dcb6 Start adding SVG icons replacement 2021-12-27 12:32:55 -08:00
Paulo Gustavo Veiga
24e810e9f8 Fix alignment and test 2021-12-27 12:29:24 -08:00
Paulo Veiga
1ce46337d6 SVG Icons Update 2021-12-27 19:42:32 +00:00
Paulo Gustavo Veiga
f36a8d70aa Work on modernizing icons 2021-12-27 11:40:08 -08:00
Paulo Gustavo Veiga
c9018c7b86 FORder icons based type 2021-12-27 09:01:01 -08:00
Paulo Gustavo Veiga
5496d66a90 Start adding SVG icons replacement 2021-12-26 21:54:43 -08:00
Paulo Gustavo Veiga
c503c590d9 Fix creation of url path for public image loading 2021-12-25 23:23:56 -08:00
Paulo Gustavo Veiga
819ce46025 Fix pathloader 2021-12-25 22:59:57 -08:00
Paulo Gustavo Veiga
fbc1948b84 Fix readOnly variable name 2021-12-25 22:31:07 -08:00
Paulo Gustavo Veiga
a8a78d053f Improve index.html for tests in mindplot 2021-12-25 21:50:45 -08:00
Paulo Gustavo Veiga
a4a478843d Update snapshots 2021-12-25 21:33:17 -08:00
Paulo Gustavo Veiga
47dac495f6 Update Copyright year 2021-12-25 14:39:34 -08:00
Paulo Gustavo Veiga
0f9a9121b3 Add support on view mode to change sample map. 2021-12-25 14:24:17 -08:00
Paulo Gustavo Veiga
db12f150d5 Fix error dialog display. 2021-12-25 12:15:56 -08:00
Paulo Gustavo Veiga
a3126f8532 Improve error message on load error 2021-12-25 12:09:02 -08:00
Paulo Gustavo Veiga
e0c18b9439 Fix welcome example 2021-12-25 11:56:09 -08:00
Paulo Gustavo Veiga
19f9f0aa91 Improve embedded view sample 2021-12-25 11:40:44 -08:00
Paulo Gustavo Veiga
4b4d6e5146 v0.4.5 2021-12-24 17:59:37 -08:00
Paulo Gustavo Veiga
9678a2cd06 Work in progress for improving examples 2021-12-24 17:53:43 -08:00
Paulo Gustavo Veiga
87115cda37 Fix readonly setting typo 2021-12-24 17:30:36 -08:00
Paulo Gustavo Veiga
6742950ab4 Move bootstrap as part of the loader 2021-12-24 11:04:50 -08:00
Paulo Gustavo Veiga
eb0caad540 Initial version 2021-12-24 09:40:08 -08:00
Paulo Gustavo Veiga
5e461c5da3 Improve build default options 2021-12-23 16:35:46 -08:00
Paulo Gustavo Veiga
b853748e0c Clean up disable 2021-12-23 12:00:11 -08:00
Paulo Gustavo Veiga
04e4efddf9 Fix persistence class names 2021-12-23 11:58:50 -08:00
Paulo Gustavo Veiga
77d88986b7 Fir eslint errors 2021-12-23 11:55:07 -08:00
Paulo Gustavo Veiga
7bae385924 Fix compilation 2021-12-23 11:41:39 -08:00
Paulo Gustavo Veiga
0dec2cc4cb Remove unsed import 2021-12-23 11:19:09 -08:00
Paulo Gustavo Veiga
8e5dc1db6c Fix readOnly on editor 2021-12-23 11:07:26 -08:00
Paulo Gustavo Veiga
ddd4d91b22 Move loader to common code. 2021-12-23 10:51:26 -08:00
Paulo Gustavo Veiga
76dcadccd6 Remove Browser object 2021-12-23 09:56:36 -08:00
Paulo Gustavo Veiga
c2189a31fa Fix font regression 2021-12-23 08:24:15 -08:00
Paulo Gustavo Veiga
7fe3631b86 v0.4.3 2021-12-22 16:30:35 -08:00
Paulo Gustavo Veiga
bed63f6fa4 v0.4.2 2021-12-22 16:30:21 -08:00
Paulo Gustavo Veiga
4caa3d7e11 v0.4.2 2021-12-22 16:30:06 -08:00
Paulo Gustavo Veiga
39a10ecc92 Add src and binary to packages 2021-12-22 16:26:59 -08:00
Paulo Veiga
1fd353a90c Add images to bundle. 2021-12-22 17:00:56 +00:00
Paulo Veiga
33967db04b Fix number validation 2021-12-22 16:51:42 +00:00
Matias Arriola
86780ed0e9 Set threshold for cypress-image-snapshot 2021-12-22 12:23:42 -03:00
Matias Arriola
5e66f1f160 Fix textarea not showing after eslint fixes (eqeqeq) 2021-12-22 11:22:08 -03:00
Paulo Gustavo Veiga
3ac1b939aa Fix webpack.plaground to inherit from webpack.common 2021-12-21 20:53:30 -08:00
Paulo Gustavo Veiga
b29b75931e Add compression pluggin 2021-12-21 20:38:13 -08:00
Paulo Gustavo Veiga
549dfed708 Clean up non required images 2021-12-21 17:23:52 -08:00
Matias Arriola
80b5885a61 Merged in feature/bundle-assets (pull request #15) 
Bundle assets to mindplot

* Make icons part of the bundle
Remove "legacy" icons

* Move images used in code to bundle

* Remove dependencies to colorPalette.{css,html}


Approved-by: Paulo Veiga
 2021-12-22 00:23:18 +00:00
Matias Arriola
5c2a96682d Merged in bugfix/topic-background (pull request #14) 
Fix topic background

* Fix Textpeer getNativePosition implementation (broken with jQuery removal)

* Remove time-bound waits from cypress tests


Approved-by: Paulo Veiga
 2021-12-21 18:05:03 +00:00
Matias Arriola
60771b2ded Merged in bugfix/undo-delete-and-tooltips (pull request #12) 
Bugfix/undo delete and tooltips

* Fix undo delete: restore NodeModel original-like implementation

* Fix empty tooltips (no text)


Approved-by: Paulo Veiga
 2021-12-20 21:21:39 +00:00
Matias Arriola
f8156fcf85 Merged in feature/web2d-remove-jquery (pull request #13) 
Remove jQuery from web2d (left only for playground)

* Remove jQuery from web2d (left only for playground)


Approved-by: Paulo Veiga
 2021-12-20 21:19:32 +00:00
Matias Arriola
b5fd708971 Merged in feature/mindplot-lint (pull request #11) 
mindplot lint

* fix eqeqeq

* fix max-len

* fix max-len, guard-for-in

* fix import/no-named-as-default-member

* misc fixes

* fix no-shadow

* fix no-param-reassign

* fix issues introduced with "fix no-param-reassign"

* Merge 'origin/develop' into feature/mindplot-lint

* lint and docs fixes after merge


Approved-by: Paulo Veiga
 2021-12-20 20:54:31 +00:00
Paulo Gustavo Veiga
c6caa3a420 Update version 2021-12-19 20:11:47 -08:00
Paulo Gustavo Veiga
e5646c446a v0.4.0 2021-12-19 20:11:10 -08:00
Paulo Gustavo Veiga
4c48c55ec1 Optimize logdash usage. 2021-12-19 19:11:04 -08:00
Paulo Gustavo Veiga
98c4da2b8d Change babel source type to module 2021-12-19 18:53:30 -08:00
Paulo Gustavo Veiga
182c48627e Remove useBuiltIns configuation 2021-12-19 18:46:47 -08:00
Paulo Gustavo Veiga
43b3f45ac8 Add Tree Shaking optimization 2021-12-19 18:34:50 -08:00
Paulo Gustavo Veiga
c502a2f669 Fix eslint errors 2021-12-19 10:37:38 -08:00
Paulo Gustavo Veiga
5e8be48916 Fix eslint errors 2021-12-19 09:56:22 -08:00
Paulo Gustavo Veiga
48642f2dcf More eslint fixes. 2021-12-19 09:11:45 -08:00
Paulo Gustavo Veiga
8a8e921c17 Fix eslint errors 2021-12-19 09:07:01 -08:00
Paulo Gustavo Veiga
c97fa80925 Remove '* as web2d' import 2021-12-19 08:31:29 -08:00
Paulo Gustavo Veiga
38f4144c67 Apply eslint --fix 2021-12-19 08:06:42 -08:00
Paulo Gustavo Veiga
6cb88b9303 Fix inspections 2021-12-19 00:44:08 -08:00
Paulo Gustavo Veiga
40d5924e25 Update versions of core 2021-12-18 15:24:31 -08:00
Paulo Gustavo Veiga
b834f3e9e1 Revert "Make package public" 
This reverts commit c2467ad8501f092805e9757a86f9f526fd6eb534.
 2021-12-18 15:20:14 -08:00
Paulo Gustavo Veiga
048104efde Clean up build config files 2021-12-18 14:55:11 -08:00
Paulo Gustavo Veiga
c3091d5e1d Configure ES6 as code language 2021-12-18 14:13:43 -08:00
Paulo Gustavo Veiga
04c5f9b69f Make package public 2021-12-18 12:48:23 -08:00
Paulo Gustavo Veiga
9b5ed73ae3 Fix i18n message loading. 2021-12-17 21:29:28 -08:00
Paulo Gustavo Veiga
1d2be6a70c Fix save of relationship control points 2021-12-17 19:31:58 -08:00
Matias Arriola
6c1b753f71 Merged in bugfix/editor-toolbar (pull request #10) 
Fixes for toolbar actions

* Fixes for toolbar actions
Remove unused dependency "add" (typo?)


Approved-by: Paulo Veiga
 2021-12-17 17:13:47 +00:00
Matias Arriola
b804403c42 Merged in feature/tests-and-docs (pull request #9) 
Improve testing flow and docs

* update snapshots

* update snapshots

* update snapshots

* Add docker run instructions

* Hide image snapshot execution behind an env flag

* Simplify package.json scripts and improve docs

* Merge 'origin/develop' into feature/tests-and-docs

* Update snapshots

* Add wait to container test

* Update snapshot


Approved-by: Paulo Veiga
 2021-12-17 02:13:54 +00:00
Paulo Gustavo Veiga
fc4cb9cd83 Fix loading of relationships 2021-12-15 17:59:51 -08:00
Paulo Gustavo Veiga
b397a583d6 Fix RestPersistenceManager.js compilation 2021-12-14 21:42:52 -08:00
Paulo Gustavo Veiga
6a6eb8fa63 Chance camelize to capitalize the first letter 2021-12-14 21:34:40 -08:00
Paulo Gustavo Veiga
643f91c18b Fix depth copy issue. 
Update welcome.xml map.
 2021-12-14 19:28:53 -08:00
Paulo Gustavo Veiga
82aa543aac Code clean up. 2021-12-14 18:28:15 -08:00
Paulo Gustavo Veiga
b2310e53fc Fix node text edition error 2021-12-14 18:04:47 -08:00
Paulo Gustavo Veiga
f95e65f21b Remove global refernece to $msg 2021-12-14 17:54:11 -08:00
Paulo Gustavo Veiga
5b74b9cff3 Fix console error log 2021-12-14 17:20:41 -08:00
Paulo Gustavo Veiga
a8a601f351 Clean up unsed test 2021-12-14 10:24:25 -08:00
Paulo Gustavo Veiga
f2a9725304 Code clean up on tests 2021-12-14 10:04:39 -08:00
Paulo Gustavo Veiga
257086f2ce Add mindplot jets tests as part of the pipeline. 2021-12-14 10:02:31 -08:00
Paulo Gustavo Veiga
516ac88b30 Fix broken tests 2021-12-14 09:58:47 -08:00
Paulo Gustavo Veiga
e8fc5d4977 Add jquery import declaration 2021-12-14 09:48:47 -08:00
Paulo Gustavo Veiga
cf6f4672fc Add missing jquery dependency 2021-12-14 09:13:39 -08:00
Paulo Veiga
75a153d1d5 Remove mootools as dependency. 2021-12-14 17:06:09 +00:00
Ezequiel Vega
25b86f3cff Increase coverage migrating tests. 2021-12-14 15:08:54 +00:00
Paulo Gustavo Veiga
695dd71921 Remove underscore from develop 2021-12-13 14:00:47 -08:00
Paulo Gustavo Veiga
143982f1a2 Fxix missing import. 2021-12-13 13:58:59 -08:00
Paulo Gustavo Veiga
4523d455a8 Fix missing declaration on LinkEditor 2021-12-13 13:46:50 -08:00
Paulo Gustavo Veiga
0b5b03691b Fix bug on class migration on constructor 2021-12-13 13:44:05 -08:00
Matias Arriola
a10b41ee4d Add more tests on mindplot/playground and fix. 2021-12-13 21:30:37 +00:00
Paulo Gustavo Veiga
e102b61c7d Fix ColorPalettePanel initialization 2021-12-12 19:12:31 -08:00
Paulo Gustavo Veiga
9c9dcabd37 Fix bug on contructor inialization on ColorPalettePanel. 2021-12-12 17:59:12 -08:00
Paulo Gustavo Veiga
d76ae3a5e3 Update web2d snapshots 2021-12-12 14:37:09 -08:00
Paulo Gustavo Veiga
ef64af2141 Improve tests. 2021-12-12 14:28:32 -08:00
Paulo Gustavo Veiga
6ba917cf32 Squashed commit of the following: 
commit 81e9041e19344df18d8e91a31edb69ea0bce6bf7
Author: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date:   Sun Dec 5 14:35:11 2021 -0800

    Fix serialization bug

commit 290223f15aa3902ef3291e0f392a92d04e9ccd0e
Author: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date:   Sun Dec 5 09:36:59 2021 -0800

    Fix serialization bug

commit 3c1a2e37cf7be34780b760eb6f2fd3e3ac577ed1
Author: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date:   Sun Dec 5 09:24:13 2021 -0800

    Fix missing references

commit 98a7fd3e1659eb32cee43144da4a10b98cfcfed0
Author: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date:   Sun Dec 5 09:08:38 2021 -0800

    Fix compile

commit 9f5146b353f0fdb34a5b83db6d120bc09a96a073
Merge: 218e074 d3dc44c
Author: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date:   Sun Dec 5 09:03:17 2021 -0800

    Merge branch 'develop' into feature/mindplot_tests_playground

commit 218e074b7330d0a02ac7afee0b644737f3bb6b03
Author: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date:   Sat Dec 4 17:46:22 2021 -0800

    Add jquery missing dependency

commit c01a748a84a2359dcf1a49d9593369c9fefe1e76
Author: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date:   Sat Dec 4 17:41:47 2021 -0800

    Remove undercore

commit d680b063b819563f4fae38571055aad4c55180b7
Author: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date:   Sat Dec 4 17:36:58 2021 -0800

    Add missing dependencies

commit be9aa21245e84c97fa9fe3545299c6bb01772ef1
Author: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date:   Sat Dec 4 17:25:23 2021 -0800

    Fix missign dependencies.

commit 2472fa453c43b64286552edb7120d4d2c395eba4
Author: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date:   Sat Dec 4 17:08:48 2021 -0800

    Fix compilation

commit a013d07dc15a3bddda1e42cad373abbdfc525c74
Merge: f2ac8fe a81e984
Author: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date:   Sat Dec 4 16:57:19 2021 -0800

    Merge branch 'develop' into feature/mindplot_tests_playground

commit f2ac8fe17de071a09f80a20f49eb42c66b5f2f2b
Author: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date:   Thu Dec 2 18:59:03 2021 -0800

    Hack: Add declaration of designer as global variable.

commit 432167acbb055fba19f1e8469db4ffe8ad7793b7
Author: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date:   Thu Dec 2 18:51:13 2021 -0800

    Hack the initialization of extended hotkey pluggin.

commit 794db35e88f6bd232094b4f104c8fe6a8fab34be
Author: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date:   Thu Dec 2 17:57:21 2021 -0800

    Add keyboard function

commit e47a48d51f1af0ebde4ebea07cb467a8e5a7a372
Author: Matias Arriola <matias.arriola@gmail.com>
Date:   Thu Dec 2 14:50:43 2021 -0300

    Fix editor snapshot

commit 9bf8baef1216352ed1f9dde4658c479c0044b093
Author: Matias Arriola <matias.arriola@gmail.com>
Date:   Thu Dec 2 13:14:13 2021 -0300

    Add editor test to mindplot playground

    Add missing imports and fix BootstrapDialog references

commit b2dcc3034fc638f58cdb59e96ab7d6e2435f634a
Author: Matias Arriola <matias.arriola@gmail.com>
Date:   Thu Dec 2 11:56:10 2021 -0300

    Add embedded test to mindplot playground

commit 08b514e1aa7b51c4df56b2b3cb7f28c191adeae7
Author: Matias Arriola <matias.arriola@gmail.com>
Date:   Thu Dec 2 10:27:31 2021 -0300

    Fix mindplot layout test

    Upgrade raphael to avoid error
    Load raphael from context-loader
 2021-12-05 15:50:37 -08:00
Paulo Gustavo Veiga
830fbdaebc Fix NPE error 2021-12-05 15:20:43 -08:00
Paulo Gustavo Veiga
cd2236eca1 - Clean webpack and babel configuration 
- Babel configure to jsmodule
 2021-12-05 15:09:07 -08:00
Paulo Gustavo Veiga
69054fcd9c Add mindmap editor playground tests 2021-12-05 09:25:16 -08:00
Paulo Gustavo Veiga
02362b28e8 Move query to be used from external library 2021-12-05 08:33:09 -08:00
Paulo Gustavo Veiga
aecf0864f5 Remove underscore library 2021-12-05 08:14:15 -08:00
Paulo Gustavo Veiga
e07c13631c Fix Text SVG 2021-12-04 16:42:00 -08:00
Paulo Gustavo Veiga
17b22ca211 Migration to EE6 of web2d and mindplot 2021-12-04 15:39:20 -08:00
Paulo Gustavo Veiga
a8a843353b Fix loading 2021-12-03 17:03:49 -08:00
Paulo Gustavo Veiga
c9cac78d2d Fix map loading 2021-12-03 16:43:50 -08:00
Paulo Gustavo Veiga
025e4714e9 Keep class migration 2021-12-03 16:11:17 -08:00
Paulo Gustavo Veiga
a95dc597f9 Convert to classes 2021-12-03 10:58:48 -08:00
Paulo Gustavo Veiga
d4da83497b Convert to classess 2021-12-03 10:58:25 -08:00
Paulo Gustavo Veiga
6f613c8f05 Move jquery out of dependency 2021-12-02 22:40:59 -08:00
Paulo Gustavo Veiga
8b2727bbb5 Clean up code 2021-12-02 22:31:19 -08:00
Paulo Gustavo Veiga
dc7000ac18 Comple migration to ES6 of element 2021-12-02 22:13:01 -08:00
Paulo Gustavo Veiga
b57dcd6fd1 Clean up core-js 2021-12-02 21:43:05 -08:00
Paulo Gustavo Veiga
c2b94b8696 Fix global import in core-js 2021-12-02 21:23:14 -08:00
Paulo Gustavo Veiga
4a93d43e83 Chage Rect to Class format 2021-12-02 20:38:53 -08:00
Paulo Gustavo Veiga
63f8ad7555 Remove webcomponent module, it must be part of mindplot. 2021-12-02 12:52:49 -08:00
Paulo Gustavo Veiga
74cc302316 Fix package descriptions 2021-12-01 19:00:52 -08:00
Paulo Gustavo Veiga
b9d3057132 Clean up mindplot playground 2021-12-01 18:12:31 -08:00
Matias Arriola
cb2ca74a20 Merged in web2d-coreJS-solutions (pull request #5) 
Core-js, web2d and mindplot working baseline

* fix .eslintignore
remove Raphael dependency

* Fix to avoid crashes in  _plotPrediction whitout Raphael

* Fix minplot basic code inspections

* Fix last inspections errors

* Inital refactor copying files

* Clean up.

* Fix web2d cyclic dependencies
remove only-warn eslint plugin
set import/no-extraneous-dependencies to warn (incorrectly complaining about root package)

* Fix web2d Point references (no need to assign it to core)
Fix web2d imports in mindplot and update Point refs

* Merge 'feature/mindplot_tests' into web2d-coreJS-solutions

* mindplot fixes and add viewmode.html playground

setup playground config to run the map-render examples
fix mindplot components export
mootools Static was not working so refactored it
fix some references to _peer
fix messages __bundle undefined
add web2d missing export: Image
downgrade cypress to avoid SIGSEGV error


Approved-by: Paulo Veiga
 2021-12-02 00:41:56 +00:00
Paulo Gustavo Veiga
c89d40758a Fix lint issues. 2021-10-05 19:08:42 -07:00
Paulo Gustavo Veiga
181ca7b34e Create libraries directory 2021-10-04 17:38:11 -07:00
Paulo Gustavo Veiga
c1fccbc489 Clean up lint problems 2021-10-04 17:21:53 -07:00
Paulo Gustavo Veiga
7e2ef09295 Fix lint errors on _ for files 2021-10-04 17:17:02 -07:00
Paulo Gustavo Veiga
9457ca6047 Enable eslit for mindplot 2021-10-04 17:05:34 -07:00
Paulo Gustavo Veiga
b25fe345ae Enable lint on module: 2021-10-04 16:56:40 -07:00
Paulo Gustavo Veiga
ce03021308 Revert "Move lint" 
This reverts commit cc8dc0c9bdbfe73bd66fed325aa7ba13efd1d3e1.
 2021-10-04 16:22:33 -07:00
Paulo Gustavo Veiga
0195ea54d1 Enable lint over web2d 2021-10-04 16:02:10 -07:00
Paulo Gustavo Veiga
7c236816b2 Fix indentation and formating problems 2021-10-03 10:49:20 -07:00
Paulo Gustavo Veiga
2dbab264ce Move lint 2021-10-03 10:30:15 -07:00
Paulo Gustavo Veiga
f1c91e1cda Configure babel output 2021-10-03 08:41:57 -07:00
Paulo Gustavo Veiga
45e79205f1 Clean up code organizing tests structure 2021-10-03 08:32:01 -07:00
Paulo Gustavo Veiga
224f0f0446 Align loaders name 2021-10-03 08:18:48 -07:00
Paulo Gustavo Veiga
6395f05d96 Rename testings.js to context-loader.js 2021-10-03 08:11:32 -07:00
Paulo Gustavo Veiga
32b8f46f66 Clean up webpack configuration 2021-10-02 20:29:24 -07:00
Paulo Gustavo Veiga
75ee4529c4 Clean up code 2021-10-02 19:52:56 -07:00
Paulo Gustavo Veiga
32d803e271 Fix structure 2021-10-02 18:37:42 -07:00
Paulo Gustavo Veiga
d53f13efd9 Remove javascript folder structure 2021-10-02 17:57:29 -07:00
Paulo Gustavo Veiga
24b3f828e3 Format test files. 2021-10-02 17:23:32 -07:00
Paulo Gustavo Veiga
38ec9931d7 Fix tests 2021-10-02 17:10:21 -07:00
Paulo Gustavo Veiga
79793820ea Remove non-used import statement 2021-10-02 16:41:29 -07:00
Paulo Gustavo Veiga
1bb017c053 Fix typo 2021-10-02 16:36:50 -07:00
Paulo Gustavo Veiga
227eafd7b5 Ignore lint error. 2021-10-02 16:27:13 -07:00
Paulo Gustavo Veiga
d1ac9fc9a6 Fix typo 2021-10-02 11:23:24 -07:00
Paulo Gustavo Veiga
29a8043c3a Fix to playglound 2021-10-02 11:21:59 -07:00
Paulo Gustavo Veiga
78d3136b92 Fix git repo urls 2021-10-02 11:20:04 -07:00
Paulo Gustavo Veiga
a092c0343c Update package name 2021-10-02 11:18:58 -07:00
Paulo Gustavo Veiga
27f4b41740 Change tests comman to payground 2021-10-02 11:12:39 -07:00
Paulo Gustavo Veiga
c557d94708 Fix yarn tests typo 2021-10-02 10:12:25 -07:00
Ezequiel Vega
6c5bff906a Merged in migration (pull request #4) 
Migration

* README.md was updated and the webpack was modified in package web2d
* README.md was updated and the webpack was modified in package mindplot
* Merge branch 'develop' of https://bitbucket.org/lilabyus/wisemapping-frontend into develop
* Mindplot module script correction
* Pull branch develop remote
* Webcomponent module webpack correction
* Pull branch develop
* Material-ui library correction and cypress test correction
* Script correction
* Cypress test correction
 2021-10-02 16:16:20 +00:00
Ezequiel Vega
5599ea2659 Webcomponent: module webpack correction 2021-09-30 17:56:26 +00:00
Ezequiel Vega
f85959b99b Mindplot module script correction 2021-09-30 17:31:26 +00:00
Ezequiel-Vega
43db369942 Mindplot: README.md was updated and the webpack 2021-09-29 17:24:08 -03:00
Ezequiel-Vega
646b861771 Web2d: README.md was updated and the webpack 2021-09-29 17:24:07 -03:00
Ezequiel-Vega
5db32ca80f Core-JS: README.md was updated and the webpack 2021-09-29 17:24:07 -03:00
Ezequiel-Vega
0567dedb88 Mindplot module migration 2021-09-29 17:24:07 -03:00
Ezequiel-Vega
d515e0bb57 Added tests palette and layout 2021-09-29 17:24:07 -03:00
Ezequiel-Vega
cbc461e760 Migration start of the mindplot module 2021-09-29 17:24:07 -03:00
Ezequiel-Vega
3ca7840dcf Web2d module migration 2021-09-29 17:24:07 -03:00
Paulo Gustavo Veiga
b71e23d163 Update version 2021-09-18 08:28:24 -07:00
Paulo Gustavo Veiga
97060ede91 chore: minor change 2021-03-02 18:22:55 -08:00
Paulo Gustavo Veiga
41f3d2129c chores: fix label error due to wrong parameters 2021-03-02 18:14:43 -08:00
Paulo Gustavo Veiga
163a7f77f8 v0.2.18 2021-03-02 18:04:29 -08:00
Paulo Gustavo Veiga
a1325268c4 chores: minor change 2021-03-02 18:03:47 -08:00
Paulo Gustavo Veiga
0921fc41e3 feature: Optimistic update for starred: 2021-03-02 18:02:08 -08:00
Paulo Gustavo Veiga
368b520748 Merge branch 'master' of bitbucket.org:wisemapping/wisemapping-frontend 2021-03-01 22:10:30 -08:00
Paulo Gustavo Veiga
8eddf5025b Add decorator for client 2021-03-01 22:10:16 -08:00
Ezequiel Bergamaschi
37dbaf676c feat: labels ui 2021-03-02 00:03:22 -05:00
Paulo Gustavo Veiga
fb2e4b3414 v0.2.17 2021-03-01 19:10:42 -08:00
Paulo Gustavo Veiga
d8453bd602 bug: serialize to boolean 2021-03-01 19:08:27 -08:00
Paulo Gustavo Veiga
06995dc131 v0.2.16 2021-03-01 18:19:33 -08:00
Paulo Gustavo Veiga
99f8252c06 v0.2.14 2021-03-01 18:07:06 -08:00
Paulo Gustavo Veiga
f3661aa2e0 Chores: add debug 2021-03-01 18:06:20 -08:00
Paulo Gustavo Veiga
bcf77d4714 v0.2.13 2021-03-01 17:49:05 -08:00
Paulo Gustavo Veiga
399cb03fc4 chores: Improve error 2021-03-01 17:48:12 -08:00
Paulo Gustavo Veiga
9b737d607a chpres: Add debug info for debug starred. 2021-03-01 17:40:34 -08:00
Paulo Gustavo Veiga
0ff867a5d7 v0.2.12 2021-02-28 20:05:49 -08:00
Paulo Gustavo Veiga
9e0bc83f19 bug: responsive layout for all except maps list 2021-02-28 20:04:51 -08:00
Paulo Gustavo Veiga
eac5f73839 v0.2.11 2021-02-28 08:12:18 -08:00
Paulo Gustavo Veiga
420262abd4 bug: Fix starred rest issue on empty return 2021-02-28 08:09:40 -08:00
Paulo Gustavo Veiga
efc581279b bug: remove padding on table list 2021-02-28 00:17:08 -08:00
Paulo Gustavo Veiga
d120524023 bug: fix min table size 2021-02-28 00:12:43 -08:00
Paulo Gustavo Veiga
2fcc98efa8 v0.2.10 2021-02-28 00:02:22 -08:00
Paulo Gustavo Veiga
ee157c1763 Fix styling 2021-02-27 23:43:26 -08:00
Paulo Gustavo Veiga
02deb9e90f v0.2.9 2021-02-27 18:40:28 -08:00
Paulo Gustavo Veiga
18c41e9d1a Fix regitration bug 2021-02-27 18:39:26 -08:00
Paulo Gustavo Veiga
5b093a018e v0.2.8 2021-02-27 12:21:46 -08:00
Paulo Gustavo Veiga
cb5c488263 Refactor AppConfig 2021-02-27 12:15:48 -08:00
Paulo Gustavo Veiga
0d58fd5e90 Update lang` 2021-02-26 22:51:27 -08:00
Paulo Gustavo Veiga
e01b896800 v0.2.7 2021-02-25 23:15:47 -08:00
Paulo Gustavo Veiga
7bc6128496 Chores: minor bug 2021-02-25 23:14:40 -08:00
Paulo Gustavo Veiga
8403aae637 v0.2.6 2021-02-25 23:07:07 -08:00
Paulo Gustavo Veiga
c0c380a7b5 Simplify generation 2021-02-25 23:01:12 -08:00
Paulo Gustavo Veiga
e647748717 bug: fix table layout 2021-02-25 22:22:34 -08:00
Paulo Gustavo Veiga
61aaa670db v0.2.5 2021-02-25 21:52:31 -08:00
Paulo Gustavo Veiga
fff9332646 Bug: Fix missing column 2021-02-25 21:41:42 -08:00
Paulo Gustavo Veiga
691094c165 v0.2.4 2021-02-25 21:11:30 -08:00
Paulo Gustavo Veiga
2ff51859d2 chores: fix label render 2021-02-25 21:10:25 -08:00
Paulo Gustavo Veiga
7753b8b776 v0.2.3 2021-02-25 19:32:04 -08:00
Paulo Gustavo Veiga
32d699f8e0 chores: fix compilation 2021-02-25 19:25:22 -08:00
Paulo Gustavo Veiga
4e7a1e8ab1 v0.2.2 2021-02-25 14:19:57 -08:00
Paulo Gustavo Veiga
ab94d127e6 Complete i18n on messages 2021-02-25 13:48:27 -08:00
Paulo Gustavo Veiga
3a7682d163 Adjust directory structure 2021-02-24 16:22:36 -08:00
Juan Allo
3d538923a9 Merged in feat/prettier (pull request #3) 
adding back semicolons

* adding back semicolons
 2021-02-23 07:02:15 +00:00
Juan Allo Ron
58e10867bd Merge branch 'master' into feat/prettier 2021-02-22 22:52:09 -08:00
Juan Allo Ron
692f98f2bb formatting all the files 2021-02-22 22:37:29 -08:00
Juan Allo Ron
8820c7f9cd adding basic config for prettier 2021-02-22 22:17:44 -08:00
Paulo Gustavo Veiga
408a4bd520 Complete support for share collabs 2021-02-22 21:49:59 -08:00
Juan Allo
d4094c4b27 Merged in feat/cypress (pull request #1) 
Adding cypress integration into the webapp

* Merge branch 'master' into feat/cypress

* moving the config files to ts

* updating from master

* adding pipeline config

* updating the cypress base image to use the same node version

* moving node to 14.15.4

* unifying all the tasks into one step

* using cypress base image for the whole pipeline for now

* removing cypress examples

* adding readme for tests

Approved-by: Ezequiel Bergamaschi
 2021-02-23 05:40:02 +00:00
Paulo Gustavo Veiga
b7c5ff3940 WIP: share rest imlp 2021-02-20 09:02:26 -08:00
Paulo Gustavo Veiga
4908bcc993 WIP: Implement rest fetch list. 2021-02-19 19:03:54 -08:00
Paulo Gustavo Veiga
e04f13cae5 chores: change import 2021-02-19 18:43:28 -08:00
Paulo Gustavo Veiga
0604a833ee WIP: Add delete action for sharing 2021-02-19 18:41:49 -08:00
Paulo Gustavo Veiga
2ae76dc08d WIP: Share dialog with mock support 2021-02-19 17:37:55 -08:00
Paulo Gustavo Veiga
c440e2426c WIP: share dialog 2021-02-17 18:10:45 -08:00
Paulo Gustavo Veiga
50ad27ed8a Reduce bundle size 
Fix export
 2021-02-17 11:16:39 -08:00
Paulo Gustavo Veiga
9c9d9ed9c2 Add html index.html generation 2021-02-17 00:11:08 -08:00
Paulo Gustavo Veiga
fca3b55551 chores: compile 2021-02-16 23:50:39 -08:00
Paulo Gustavo Veiga
01bd151460 Disable html generation 2021-02-16 23:39:28 -08:00
Paulo Gustavo Veiga
2692f58aad Fix jslint 2021-02-16 22:01:25 -08:00
Paulo Gustavo Veiga
8c7b2c810b Fix jslint errors. 2021-02-16 21:51:59 -08:00
Ezequiel Bergamaschi
569a6649a8 chore: fix eslint 2021-02-16 22:47:09 -05:00
Paulo Gustavo Veiga
beeabc325c Minor refactor 2021-02-16 13:09:58 -08:00
Paulo Gustavo Veiga
ea80fc5315 Replace moment library 2021-02-16 13:07:54 -08:00
Paulo Gustavo Veiga
ea04199c14 Filter unsuported locales 2021-02-16 12:01:32 -08:00
Paulo Gustavo Veiga
cd61bd8fa0 Fix import 2021-02-16 11:31:31 -08:00
Paulo Gustavo Veiga
756f46704a Fix imports 2021-02-16 11:30:18 -08:00
Paulo Gustavo Veiga
3d1a165f0e Split bundle 2021-02-16 11:22:55 -08:00
Paulo Gustavo Veiga
7cdde4af4e Add compress to common 2021-02-16 11:14:04 -08:00
Paulo Gustavo Veiga
c8a1352376 Unify config for webpack 2021-02-16 11:11:13 -08:00
Paulo Gustavo Veiga
afbc91c387 Add lint config 2021-02-16 10:48:09 -08:00
Paulo Gustavo Veiga
1972969298 Configure momentum i18n. 2021-02-16 10:18:58 -08:00
Paulo Gustavo Veiga
ef63782a57 Improve bundle size. 2021-02-16 10:05:41 -08:00
Paulo Gustavo Veiga
6cee84bbe9 Fix imports to reduce bundle size. 2021-02-16 09:11:33 -08:00
Paulo Gustavo Veiga
e3bfaf9e8c Minor fix 2021-02-16 08:35:26 -08:00
Paulo Gustavo Veiga
c65a6a72ce Minor changes 2021-02-16 01:37:24 -08:00
Paulo Gustavo Veiga
d1ff38fdca Add compression 2021-02-16 01:15:04 -08:00
Paulo Gustavo Veiga
8efc8c283d Fix build 2021-02-16 00:14:44 -08:00
Paulo Gustavo Veiga
8553cf3629 Optimize bundle. 2021-02-16 00:12:28 -08:00
Paulo Gustavo Veiga
7b24c26d46 Split webpack 2021-02-15 23:43:26 -08:00
Paulo Gustavo Veiga
f1fbdb7ebe Delete message 2021-02-15 17:17:11 -08:00
Paulo Gustavo Veiga
02fae8e18d Delete account support 2021-02-15 17:15:54 -08:00
Paulo Gustavo Veiga
d9add8605c Complete account change 2021-02-15 15:42:10 -08:00
Paulo Gustavo Veiga
3a10dce222 Complete change password. 2021-02-15 00:47:10 -08:00
Paulo Gustavo Veiga
616396fe6a Clean up clode 2021-02-14 23:41:14 -08:00
Paulo Gustavo Veiga
0e8c75d32c Add help us to translate ! 2021-02-14 23:32:52 -08:00
Paulo Gustavo Veiga
ca833d60de Complete i18n support 2021-02-14 17:53:37 -08:00
Paulo Gustavo Veiga
77e3d24eb1 Remove global CSS import 2021-02-14 16:33:36 -08:00
Paulo Gustavo Veiga
3dec2cdd77 Refactor 2021-02-13 10:52:15 -08:00
Paulo Gustavo Veiga
719623ea3a Minor bug fixing 2021-02-13 10:10:02 -08:00
Paulo Gustavo Veiga
6091b6a7ad Refactor locale class 2021-02-12 19:03:47 -08:00
Paulo Gustavo Veiga
d57cec6f80 WIP: locale 2021-02-12 18:00:54 -08:00
Paulo Gustavo Veiga
db6da3d75e Fix remember me 2021-02-12 16:30:38 -08:00
Paulo Gustavo Veiga
c31a0dcab9 Add change language button 2021-02-10 18:35:13 -08:00
Paulo Gustavo Veiga
1c5d6342e5 Finish import 2021-02-10 18:03:51 -08:00
Paulo Gustavo Veiga
1c7dbb8af5 Minor fix. 2021-02-09 18:35:57 -08:00
Paulo Gustavo Veiga
5145058651 Complete Export support 2021-02-09 18:32:52 -08:00
Paulo Gustavo Veiga
3310d74ebb Progress on export. 2021-02-09 09:14:49 -08:00
Paulo Gustavo Veiga
f1878ed14e Export work in progress. 2021-02-08 11:30:32 -08:00
Paulo Gustavo Veiga
197ce17af1 Fix load of empty users 2021-02-07 10:14:03 -08:00
Paulo Gustavo Veiga
40e89a58d4 Refactor account component and complete account loading 2021-02-07 09:59:45 -08:00
Paulo Gustavo Veiga
4b1c92757f Extract components 2021-02-07 08:38:50 -08:00
Paulo Gustavo Veiga
b67e88f3dc Complete rename 2021-02-07 00:02:16 -08:00
Paulo Gustavo Veiga
ce05cc3d18 Implement revert 2021-02-06 23:09:46 -08:00
Paulo Gustavo Veiga
7df6f3744b Complete deleat all 2021-02-06 22:51:04 -08:00
Paulo Gustavo Veiga
fe9f40b73b Complete info dialog. 2021-02-06 17:47:34 -08:00
Paulo Gustavo Veiga
16c2d1baaf Improve UI 2021-02-06 09:06:14 -08:00
Paulo Gustavo Veiga
d2a4fa0365 Fix dialog action filtering 2021-02-06 08:27:37 -08:00
Paulo Gustavo Veiga
5f41821f00 Complete public panel 2021-02-06 00:45:33 -08:00
Paulo Gustavo Veiga
c923c18cf9 Fix form loading 2021-02-05 16:35:39 -08:00
Paulo Gustavo Veiga
2a7387cb6c Fix minor bugs on history 2021-02-05 13:28:32 -08:00
Paulo Gustavo Veiga
85d44786c7 Complete history channel 2021-02-05 13:15:36 -08:00
Paulo Gustavo Veiga
87a12c25b1 Complete public map filtering 2021-02-05 09:46:16 -08:00
Paulo Gustavo Veiga
680a679a92 Add error exception 2021-02-04 23:05:46 -08:00
Paulo Gustavo Veiga
6115eeec26 Implement load labels 2021-02-04 19:08:08 -08:00
Paulo Gustavo Veiga
9596852c90 Add label calor support 2021-02-04 17:40:41 -08:00
Paulo Gustavo Veiga
858050096f Complete starred support for rest 2021-02-04 14:34:13 -08:00
Paulo Gustavo Veiga
0d7cf3e5b1 Complete duplicate action for rest. 2021-02-04 10:23:58 -08:00
Paulo Gustavo Veiga
86d78935f0 Complete delete rest 2021-02-04 10:13:58 -08:00
Paulo Gustavo Veiga
56c843970b Compleate create new map. 2021-02-04 10:01:35 -08:00
Paulo Gustavo Veiga
a6951b850e Comple client maps loading 2021-02-03 20:34:24 -08:00
Paulo Gustavo Veiga
b10360fe6f Improve error handling 2021-02-03 17:53:37 -08:00
Paulo Gustavo Veiga
eeceb9734a Fix error parsing bug on return 2021-02-03 16:27:34 -08:00
Paulo Gustavo Veiga
8df40788ba Split Client into two classes. 2021-02-03 14:27:32 -08:00
Paulo Gustavo Veiga
a45d18aebc Fix username password error 2021-02-03 10:51:41 -08:00
Paulo Gustavo Veiga
6446ea8581 v0.2.1 2021-02-03 10:07:03 -08:00
Paulo Gustavo Veiga
481c1fe619 Add create dialog 2021-02-02 10:54:37 -08:00
Paulo Gustavo Veiga
67fec75d91 Fix several bugs 2021-02-02 00:20:35 -08:00
Paulo Gustavo Veiga
973290d6dd Complete delete labels 2021-02-01 22:15:32 -08:00
Paulo Gustavo Veiga
a1867168ec Complete menu navigation 2021-01-31 18:04:50 -08:00
Paulo Gustavo Veiga
db934afed8 Fix menu. 2021-01-31 02:40:21 -08:00
Paulo Gustavo Veiga
68ebc404c4 Add format 2021-01-31 00:29:36 -08:00
Paulo Gustavo Veiga
4905fcc58f Favicon update 2021-01-30 23:42:16 -08:00
Paulo Gustavo Veiga
21ccfc13f6 Update icons 2021-01-30 22:01:56 -08:00
Paulo Gustavo Veiga
13d7a5d8ee More change on main dialog 2021-01-30 00:51:02 -08:00
Paulo Gustavo Veiga
1b7f172518 Fix dialog missing msg. 2021-01-28 11:28:59 -08:00
Paulo Gustavo Veiga
2a6782f165 Clean up styles. 2021-01-25 17:54:54 -08:00
Paulo Gustavo Veiga
cd18df3811 Refactor styles 2021-01-25 16:36:57 -08:00
Paulo Gustavo Veiga
1dda8b6c9f Complete info dialog. 2021-01-14 01:14:07 -08:00
Paulo Gustavo Veiga
3552f33ee1 Improve dialog styles 2021-01-13 19:46:45 -08:00
Paulo Gustavo Veiga
73120ca91d Fix dialog bug. 2020-12-27 18:18:57 -08:00
Paulo Gustavo Veiga
cbb53d244f Refactor dialog. 2020-12-27 16:37:10 -08:00
Paulo Gustavo Veiga
911f131a2a Compelte migration of summit form 2020-12-27 15:18:33 -08:00
Paulo Gustavo Veiga
503bc125c7 Complete refactor to react query 2020-12-26 19:32:41 -08:00
Paulo Gustavo Veiga
fbb2b11175 Introduce react-query 2020-12-25 21:39:54 -08:00
Paulo Gustavo Veiga
60fd57b094 Redux initial refactor 2020-12-24 17:39:06 -08:00
Paulo Gustavo Veiga
fed51ad5a9 Add support for error handling. 2020-12-20 18:33:17 -08:00
Paulo Gustavo Veiga
d0ad7f4286 Fix compiles 2020-12-20 15:55:50 -08:00
Paulo Gustavo Veiga
b59ede3fcc Initial version of maps list. WIP 2020-12-20 15:54:14 -08:00
Paulo Gustavo Veiga
5b2bc9390b Initial version of maps list. WIP 2020-12-20 11:04:50 -08:00
Paulo Gustavo Veiga
3a049d203d Fix message 2020-12-12 18:02:24 -08:00
Paulo Gustavo Veiga
6ce2086081 v0.1.7 2020-12-12 13:13:45 -08:00
Paulo Gustavo Veiga
baf7daed72 Default fallback 2020-12-12 13:12:29 -08:00
Paulo Gustavo Veiga
235f89e2e2 v0.1.6 2020-12-12 13:00:05 -08:00
Paulo Gustavo Veiga
c6947dcb39 Add support for external runtime configuration 2020-12-12 12:23:38 -08:00
Paulo Gustavo Veiga
9d80a03018 Change URLS: 2020-12-11 20:37:48 -08:00
Paulo Gustavo Veiga
ff5859a704 Change URLs format 2020-12-11 20:33:02 -08:00
Paulo Gustavo Veiga
bec0c7998c Complete forgot password page. 2020-12-11 20:06:42 -08:00
Paulo Gustavo Veiga
bc3b7104dd Remove all CSS 2020-12-09 22:29:28 -08:00
Paulo Gustavo Veiga
0e0ef13e92 Continue migration to styles-component 2020-12-09 19:33:30 -08:00
Paulo Gustavo Veiga
e5866a9e4e Fix basepath 2020-12-08 19:44:12 -08:00
Paulo Gustavo Veiga
dc3e5ebcbe Enable path correction. 2020-12-08 19:35:02 -08:00
Paulo Gustavo Veiga
76d4593500 Start migration to styled components 2020-12-08 09:35:36 -08:00
Paulo Gustavo Veiga
a6fe41b5c9 Start forgot password 2020-12-08 08:58:42 -08:00
Paulo Gustavo Veiga
7c53c6b9c7 Complete success page. 2020-12-07 23:14:08 -08:00
Paulo Gustavo Veiga
f575560197 Generate ES resources 2020-12-07 18:47:24 -08:00
Paulo Gustavo Veiga
e7738b1cce Minor change in title 2020-12-07 11:32:57 -08:00
Paulo Gustavo Veiga
1c795571eb Move to strict checking 
Change page title
 2020-12-07 11:23:08 -08:00
Paulo Gustavo Veiga
f219068d66 Fix case 2020-12-06 16:53:23 -08:00
Paulo Gustavo Veiga
e8d38678c7 Move all to webapp. 2020-12-06 16:31:48 -08:00
Paulo Gustavo Veiga
496455d1ea Complete error handling. 2020-12-06 15:56:30 -08:00
Paulo Gustavo Veiga
98ebbaceee Refactor service class. 2020-12-06 14:54:37 -08:00
Paulo Gustavo Veiga
09ed5a39d8 Fix recaptch 2020-12-06 09:13:43 -08:00
Paulo Gustavo Veiga
0bed6d8326 Fix compilation error 2020-12-06 09:05:08 -08:00
Paulo Gustavo Veiga
44e321be34 Clean up errors 2020-12-06 09:02:57 -08:00
Paulo Gustavo Veiga
e243abe252 Fix error on page load.. 2020-12-06 08:24:53 -08:00
Paulo Gustavo Veiga
4b01c49ed1 Fix image loading 2020-12-05 23:08:55 -08:00
Paulo Gustavo Veiga
93f68ff8ea Reorganize packages location 2020-12-05 22:35:21 -08:00
Paulo Gustavo Veiga
cd72287481 Migration to TypeScript 2020-12-05 21:48:09 -08:00
Paulo Gustavo Veiga
b8182be60f Fix wrong path 2020-12-05 13:57:39 -08:00
Paulo Gustavo Veiga
4e938b8a52 Fix redirect 2020-12-05 13:18:44 -08:00
Paulo Gustavo Veiga
d2d2a09e33 Improve header styles 2020-12-05 10:42:11 -08:00
Ezequiel Bergamaschi
937f5ff9cb refactor: support lerna, include @wisemapping/login into webapp 2020-12-05 02:47:02 -05:00