1032 Commits

Author SHA1 Message Date
Paulo Gustavo Veiga
2c9a181496 Update springboot version. 2024-05-21 20:02:35 -07:00
Paulo Gustavo Veiga
82d5caa1ea Merge branch 'develop' of github.com:wisemapping/wisemapping-open-source into develop 2024-04-06 08:45:28 -07:00
Paulo Gustavo Veiga
c71da91af0 Improve application.yml documentation. 2024-04-06 08:43:20 -07:00
Paulo Gustavo Veiga
a89a4ff049 Update README.md 2024-04-06 02:58:12 -07:00
Paulo Gustavo Veiga
20f730eb36 Update README.md 2024-04-06 02:56:54 -07:00
Paulo Gustavo Veiga
ec7dd972b6 Update README.md 2024-04-06 02:53:39 -07:00
Paulo Gustavo Veiga
0d3d28b871 Minor change 2024-04-06 02:52:44 -07:00
Paulo Gustavo Veiga
b04baef6e9 Minor fix. 2024-04-06 02:51:10 -07:00
Paulo Gustavo Veiga
b510e4929e Improve documentation. 2024-04-06 02:47:01 -07:00
Paulo Gustavo Veiga
12b46b4400 Update springboot version. 2024-03-25 23:59:02 -07:00
Paulo Gustavo Veiga
0d7b66a54f Update springboot. 2024-03-25 23:53:10 -07:00
Paulo Gustavo Veiga
cfb2fc60d8 Minor fix on metadata permissions. 2024-03-25 22:47:37 -07:00
Paulo Gustavo Veiga
4401cf8fe9 Fix metadata endpoint permissions. 2024-03-25 22:45:21 -07:00
Paulo Gustavo Veiga
21dfcf3c4f Add missing endpoint on non-auth. 2024-03-25 22:40:35 -07:00
Paulo Gustavo Veiga
8b583bf5b2 Fix logo image. 2024-03-25 22:29:15 -07:00
Paulo Gustavo Veiga
b821e96e13 Fix failing test 2024-03-24 19:04:52 -07:00
Paulo Gustavo Veiga
eb66e6981a Fix docker base api 2024-03-24 11:19:09 -07:00
Paulo Gustavo Veiga
efc3cd5753 Add build docker image. 2024-03-24 11:13:31 -07:00
Paulo Gustavo Veiga
8ca83bfdad Remove dependecy analyzer 2024-03-24 11:08:38 -07:00
Paulo Gustavo Veiga
39dbafa536 Skip test execution. 2024-03-24 11:05:43 -07:00
Paulo Gustavo Veiga
08339cb721 Update dependecy graph. 2024-03-24 11:03:54 -07:00
Paulo Gustavo Veiga
2847ef434c Add zulu as distribution. 2024-03-24 11:01:30 -07:00
Paulo Gustavo Veiga
9c2e8219af Update java version. 2024-03-24 10:56:03 -07:00
Paulo Gustavo Veiga
72acbc8d65 Update Java requirement. 2024-03-24 10:53:45 -07:00
Paulo Gustavo Veiga
28afb28241 Remove bitbucket build config. 2024-03-24 10:48:53 -07:00
Paulo Gustavo Veiga
b05df6f957 Fist version of CI/CD 2024-03-24 10:42:45 -07:00
Paulo Gustavo Veiga
9493e3addb Update java version. 2024-03-24 10:24:55 -07:00
Paulo Gustavo Veiga
c2ddbed929 Remove webapp. 2024-03-24 10:22:34 -07:00
Paulo Gustavo Veiga
3273d74501 Bump version. 2024-03-24 10:18:19 -07:00
Paulo Gustavo Veiga
c287d47c84 Merge branch 'feature/springboot2' into develop 2024-03-24 10:15:42 -07:00
Paulo Gustavo Veiga
1e548136ff Improve code. 2024-03-24 09:01:43 -07:00
Paulo Gustavo Veiga
ede2fb7622 Improve code. 2024-03-24 08:33:06 -07:00
Paulo Gustavo Veiga
e99424db01 Add code. 2024-03-24 00:37:14 -07:00
Paulo Gustavo Veiga
be27292699 Minor change. 2024-03-24 00:15:55 -07:00
Paulo Gustavo Veiga
0f4cfcd0d1 Add jwt token on confirmation. 2024-03-24 00:15:04 -07:00
Paulo Gustavo Veiga
3daebd149a Return token. 2024-03-23 23:29:48 -07:00
Paulo Gustavo Veiga
12d67d42ea Add login. 2024-03-23 23:07:14 -07:00
Paulo Gustavo Veiga
16e2829598 Add logs. 2024-03-23 22:56:12 -07:00
Paulo Gustavo Veiga
9547543042 Add missing auth. 2024-03-21 22:22:32 -07:00
Paulo Gustavo Veiga
cad9c6ca0f Fix endpoint URL 2024-03-21 22:16:31 -07:00
Paulo Gustavo Veiga
174c98a6a5 Add missing oath attribute 2024-03-21 22:00:18 -07:00
Paulo Gustavo Veiga
3c11f4034f Add ui base url. 2024-03-13 22:10:09 -07:00
Paulo Gustavo Veiga
c6af830dfa Update java vesion. 2024-03-13 21:56:29 -07:00
Paulo Gustavo Veiga
80ffdebf33 Update springboot. 2024-03-13 21:54:23 -07:00
Paulo Gustavo Veiga
002d761645 Remove docker. 2024-03-13 21:49:50 -07:00
Paulo Gustavo Veiga
33f228c30c Minor fix on email adrress on mail. 2024-03-13 21:22:23 -07:00
Paulo Gustavo Veiga
34acc83582 Improve error message. 2024-02-29 19:38:16 -08:00
Paulo Gustavo Veiga
d7ac0ec28f Fix test. 2024-02-20 22:13:43 -08:00
Paulo Gustavo Veiga
853f500454 Add JWT time. 2024-02-20 21:52:56 -08:00
Paulo Gustavo Veiga
849e700ef8 Minor fix, 2024-02-19 21:47:49 -08:00
Paulo Gustavo Veiga
08ce41da5f Add creator full name 2024-02-19 21:15:45 -08:00
Paulo Gustavo Veiga
cf154de2e4 Add new test. 2024-02-19 14:12:51 -08:00
Paulo Gustavo Veiga
2e20bd6a0e Add configuration endpoint. 2024-02-19 00:28:05 -08:00
Paulo Gustavo Veiga
fef33dad03 Add support for configuration. 2024-02-18 22:55:19 -08:00
Paulo Gustavo Veiga
af97d51cba Change mail image. 2024-02-18 18:37:39 -08:00
Paulo Gustavo Veiga
4c9af90815 Remove dead code. 2024-02-18 18:35:51 -08:00
Paulo Gustavo Veiga
aa75aefe66 Fix server props. 2024-02-18 16:20:22 -08:00
Paulo Gustavo Veiga
00935dbb93 Improve docker image. 2024-02-18 16:14:56 -08:00
Paulo Gustavo Veiga
b9bd733e5e Add missing corse. 2024-02-18 08:44:46 -08:00
Paulo Gustavo Veiga
e409abb265 Add headers on CORS 2024-02-17 19:32:53 -08:00
Paulo Gustavo Veiga
bf3b082bdf Webconfig. 2024-02-17 18:21:33 -08:00
Paulo Gustavo Veiga
3106b3e94a Add cors configuration support. 2024-02-17 18:16:46 -08:00
Paulo Gustavo Veiga
a829844c1a Test cors config. 2024-02-17 18:07:58 -08:00
Paulo Gustavo Veiga
7f959ce869 Add postgress suppot 2024-02-17 13:48:11 -08:00
Paulo Gustavo Veiga
52fdefb57e Fixed. 2024-02-17 11:18:43 -08:00
Paulo Gustavo Veiga
0dcdc2c263 Fix posgresql 2024-02-17 00:54:41 -08:00
Paulo Gustavo Veiga
aadb88451b Mysql 2024-02-17 00:14:09 -08:00
Paulo Gustavo Veiga
83e080d677 Update to MySQL 8. 2024-02-16 22:49:33 -08:00
Paulo Gustavo Veiga
b13748d47d Remove UI support 2024-02-16 22:20:28 -08:00
Paulo Gustavo Veiga
eaf03ea28d Clean up. 2024-02-11 12:21:38 -08:00
Paulo Gustavo Veiga
f8b8aea901 Add support for configure http basic. 2024-02-10 13:53:44 -08:00
Paulo Gustavo Veiga
6f528835bf Fix try access. 2024-02-09 23:55:05 -08:00
Paulo Gustavo Veiga
555c6383b9 Fix location resolver. 2024-02-09 23:35:26 -08:00
Paulo Gustavo Veiga
34318c1e3f Fix json props. 2024-02-09 00:02:56 -08:00
Paulo Gustavo Veiga
05c2e545ae Add map metadata. 2024-02-07 18:44:33 -08:00
Paulo Gustavo Veiga
885de4e1c1 Fix login bug. 2024-02-07 00:04:06 -08:00
Paulo Gustavo Veiga
56c322fd3f Add redirect on expiration. 2024-02-06 23:43:52 -08:00
Paulo Gustavo Veiga
e3998ef3d4 Migrate to springboot emai. 2024-02-06 23:04:25 -08:00
Paulo Gustavo Veiga
88d5f0df43 Renove http basic. 2024-02-06 22:26:44 -08:00
Paulo Gustavo Veiga
37d7a9bb6d Add missing expoint test. 2024-02-06 21:12:15 -08:00
Paulo Gustavo Veiga
d798358fec Minor expoint fixes. 2024-02-05 21:21:34 -08:00
Paulo Gustavo Veiga
96b6ff3841 Fix typo on path. 2024-02-04 21:10:48 -08:00
Paulo Gustavo Veiga
34a5328a2c Complete JWT token support. 2024-02-04 20:53:24 -08:00
Paulo Gustavo Veiga
082f2614e3 Move to in memory 2024-02-04 19:45:14 -08:00
Paulo Gustavo Veiga
069943cf30 Add first version of token generation. 2024-02-04 18:28:23 -08:00
Paulo Gustavo Veiga
6674c607f7 Add registration test. 2024-02-04 17:31:21 -08:00
Paulo Gustavo Veiga
a681cf9b90 Add user test. 2024-02-04 17:21:51 -08:00
Paulo Gustavo Veiga
9382fc2995 Clean up code. 2024-02-04 10:47:10 -08:00
Paulo Gustavo Veiga
af4016cadd Improve code on rest. 2024-02-04 10:42:16 -08:00
Paulo Gustavo Veiga
fdffda6186 Improve code. 2024-02-04 10:09:10 -08:00
Paulo Gustavo Veiga
d4c50b4c2a Remove MVC ui support. 2024-02-04 08:54:07 -08:00
Paulo Gustavo Veiga
b3ea3e5a5b Container load. 2024-02-04 08:45:00 -08:00
Paulo Gustavo Veiga
01e0639c55 Fix compose. 2024-02-03 23:22:38 -08:00
Paulo Gustavo Veiga
71f77f6e79 Start docker compoose. 2024-02-03 23:10:32 -08:00
Paulo Gustavo Veiga
f046bcaebc Start working on docker compose. 2024-02-03 20:35:09 -08:00
Paulo Gustavo Veiga
c976046fca Convert to yaml. 2024-02-03 19:42:15 -08:00
Paulo Gustavo Veiga
7724d9106d Clean up jpa setting. 2024-02-03 19:37:10 -08:00
Paulo Gustavo Veiga
f86f96a35e Test 100% 2024-02-03 15:35:09 -08:00
Paulo Gustavo Veiga
e28302236b Fix more test. 2024-02-03 15:27:26 -08:00
Paulo Gustavo Veiga
f528abaa44 Fix more tests. 2024-02-03 15:13:38 -08:00
Paulo Gustavo Veiga
80c30daece More tests fixed. 2024-02-03 14:51:59 -08:00
Paulo Gustavo Veiga
51e2732ae2 Fix more tests. 2024-02-03 14:17:30 -08:00
Paulo Gustavo Veiga
1db881e3e2 Fix more tests. 2024-02-03 12:26:18 -08:00
Paulo Gustavo Veiga
1059643b0f Fix label test. 2024-01-23 22:31:46 -08:00
Paulo Gustavo Veiga
740da238fa Fix test. 2024-01-23 22:20:10 -08:00
Paulo Gustavo Veiga
ccfcb3b335 fix more test 2024-01-22 23:18:25 -08:00
Paulo Gustavo Veiga
56e4970861 Fix more test. 2024-01-22 23:11:20 -08:00
Paulo Gustavo Veiga
861b4f22fd Improve security filter code. 2024-01-22 23:08:04 -08:00
Paulo Gustavo Veiga
cdbeaf5216 Fix more tests. 2024-01-22 22:46:38 -08:00
Paulo Gustavo Veiga
d49766463a Add automation. 2024-01-22 21:54:37 -08:00
Paulo Gustavo Veiga
27c310197e Remove. 2024-01-21 22:28:03 -08:00
Paulo Gustavo Veiga
bbb6f362bd Fix test. 2024-01-21 22:27:53 -08:00
Paulo Gustavo Veiga
6ca26ffd10 Fix test 2024-01-21 22:09:28 -08:00
Paulo Gustavo Veiga
a3022d36d2 Fix SQL data initialization 2024-01-21 22:02:58 -08:00
Paulo Gustavo Veiga
f0bc9e53ea Fix platform initialization 2024-01-21 17:39:14 -08:00
Paulo Gustavo Veiga
fc66a52232 More fixes 2024-01-21 17:36:56 -08:00
Paulo Gustavo Veiga
d03a9e5eea Fix controller loading. 2024-01-21 15:42:02 -08:00
Paulo Gustavo Veiga
50a0c340b2 Improve security filter code. 2024-01-21 15:18:07 -08:00
Paulo Gustavo Veiga
a3b289a738 Fix application config 2024-01-20 14:51:46 -08:00
Paulo Gustavo Veiga
9dcb139169 Clean up configuration 2024-01-16 21:24:21 -08:00
Paulo Gustavo Veiga
a69256b793 Fix classpath 2024-01-15 20:10:52 -08:00
Paulo Gustavo Veiga
33ec2de925 Fix more tests. 2024-01-15 18:13:57 -08:00
Paulo Gustavo Veiga
c99d7837a3 Remove icon as mandatory 2024-01-15 18:10:01 -08:00
Paulo Gustavo Veiga
2357101b42 Fix test 2024-01-15 18:09:01 -08:00
Paulo Gustavo Veiga
832e1991e5 Fix several tests 2024-01-15 17:30:31 -08:00
Paulo Gustavo Veiga
7d4f51b3ea Fix test 2024-01-15 16:47:28 -08:00
Paulo Gustavo Veiga
12832b0a91 Merge branch 'feature/springboot2' of bitbucket.org:wisemapping/wisemapping-open-source into feature/springboot2 2024-01-15 16:39:28 -08:00
Paulo Gustavo Veiga
c91cafa8ff Simplyfy auth. 2024-01-15 16:38:18 -08:00
Paulo Gustavo Veiga
a4c0c4deb7 Simplyfy auth. 2024-01-15 16:36:29 -08:00
Paulo Gustavo Veiga
b7591ab995 Fix authentication. 2024-01-15 16:20:00 -08:00
Paulo Gustavo Veiga
5fe3bb082a Fix interceptor 2024-01-15 15:42:04 -08:00
Paulo Gustavo Veiga
3a9aad02cf Partial migration of mail 2024-01-15 14:08:23 -08:00
Paulo Gustavo Veiga
03a6c0ef8b Fix rest auth. Review filters. 2024-01-15 07:59:04 -08:00
Paulo Gustavo Veiga
2f32ef66e9 Migrate all to entity manager. 2024-01-13 18:49:49 -08:00
Paulo Gustavo Veiga
fbbc95fd59 Fix JPA load. 2024-01-13 18:31:21 -08:00
Paulo Gustavo Veiga
e98d6ca2a9 Add missing properly on embedd view 2023-12-13 12:21:14 -08:00
Paulo Gustavo Veiga
712fbaa3a7 Handle authentication errors to avoid being reported as 500 2023-12-12 18:07:44 -08:00
Paulo Gustavo Veiga
19d083e218 Fix property lazy initialization error. 2023-12-04 20:29:19 -08:00
Paulo Gustavo Veiga
e1b517f657 Add db creation. 2023-12-04 20:00:06 -08:00
Paulo Gustavo Veiga
fa06852806 Add static resources. 2023-11-27 21:47:22 -08:00
Paulo Gustavo Veiga
079f8ac417 Fix MVC 2023-11-27 21:09:00 -08:00
Paulo Gustavo Veiga
ea6b2ad106 Fix public resource sharing. 2023-11-26 16:13:45 -08:00
Paulo Gustavo Veiga
52d684d611 Fix JPA. 2023-11-26 15:42:22 -08:00
Paulo Gustavo Veiga
c29098d717 WIP 2023-11-24 19:26:36 -08:00
Paulo Gustavo Veiga
15325672a0 Move db initialization to beans. 2023-11-22 21:43:11 -08:00
Paulo Gustavo Veiga
cd3d21f106 Move app.properties definition 2023-11-22 20:46:38 -08:00
Paulo Gustavo Veiga
12b0bb4866 Add missing message. 2023-11-22 20:29:10 -08:00
Paulo Gustavo Veiga
2c1e634a1a Fix log level for ValidationException 2023-11-22 20:23:52 -08:00
Paulo Gustavo Veiga
597e3ab165 Move security auth. 2023-11-22 16:50:56 -08:00
Paulo Gustavo Veiga
1c73a8d79d Fix exception handling on JSP 2023-11-20 19:56:28 -08:00
Paulo Gustavo Veiga
68c8f5c6b8 Add @Transactional to controller. 2023-11-20 19:47:53 -08:00
Paulo Gustavo Veiga
d26b516eb9 Clean up. 2023-11-20 19:44:59 -08:00
Paulo Gustavo Veiga
538083ae83 Add transction 2023-11-20 19:37:08 -08:00
Paulo Gustavo Veiga
60923e4c8b Improve error log. 2023-11-20 19:26:08 -08:00
Paulo Gustavo Veiga
214e3938c1 Add JSP comments. 2023-11-20 19:19:57 -08:00
Paulo Gustavo Veiga
f49ae37866 Add exception details in JSP. 2023-11-20 19:14:01 -08:00
Paulo Gustavo Veiga
ad158e4821 Fix parameter injection. 2023-11-20 18:57:50 -08:00
Paulo Gustavo Veiga
769968376b Add log verbosity. 2023-11-20 08:00:09 -08:00
Paulo Gustavo Veiga
9668823c31 Fix missing URLs. 2023-11-20 07:41:51 -08:00
Paulo Gustavo Veiga
55c104cfbe fix lazy initialization error. 2023-11-20 07:27:56 -08:00
Paulo Gustavo Veiga
92edef9bd6 Minor variable rename. 2023-11-19 20:28:27 -08:00
Paulo Gustavo Veiga
884a93478b Fix been lazy loading issue. 2023-11-19 20:22:05 -08:00
Paulo Gustavo Veiga
63975464ca Add enable_lazy_load_no_trans fix. 2023-11-19 19:11:06 -08:00
Paulo Gustavo Veiga
2b918a0df3 Move collaborations to header to prevent aused by org.hibernate.LazyInitializationException: could not initialize proxy [com.wisemapping.model.Collaborator#758998] - no Session error 2023-11-19 18:55:16 -08:00
Paulo Gustavo Veiga
9c1320b63b Fix logger path location. 2023-11-19 15:59:43 -08:00
Paulo Gustavo Veiga
1589665633 Move log4j2-stdout.xml 2023-11-19 15:56:59 -08:00
Paulo Gustavo Veiga
479eb6db2c Refactor beens loading. 2023-11-19 15:40:16 -08:00
Paulo Gustavo Veiga
a739bb3e0b Move more services out of XML definition. 2023-11-19 08:28:40 -08:00
Paulo Gustavo Veiga
50e4a68d28 More classes to annotation. 2023-11-19 08:05:38 -08:00
Paulo Gustavo Veiga
8ec7c4edea Move couple of classes to services
Improve label security.
2023-11-19 07:57:23 -08:00
Paulo Gustavo Veiga
480fd49fd0 Keep transaction simplication 2023-11-19 00:31:41 -08:00
Paulo Gustavo Veiga
61c691fc82 Fix creation. 2023-11-18 23:45:31 -08:00
Paulo Gustavo Veiga
3eaeb8f500 Fix new user creation. 2023-11-18 23:30:06 -08:00
Paulo Gustavo Veiga
07e8259417 WIP 2023-11-18 23:22:25 -08:00
Paulo Gustavo Veiga
ab15fb2d36 Fix lock message. 2023-11-15 20:45:15 -08:00
Paulo Veiga
315267e68c Migrate to hibernate 6 2023-10-30 05:34:45 +00:00
Paulo Veiga
881a16b908 messages_ru.properties edited online with Bitbucket 2023-10-09 23:39:25 +00:00
Paulo Veiga
dd8f5ab1ea README.md edited online with Bitbucket 2023-10-07 17:55:06 +00:00
Paulo Veiga
0c37ed904a license.md edited online with Bitbucket 2023-10-07 17:51:04 +00:00
Paulo Gustavo Veiga
946ef517d3 Merge branch 'develop' of bitbucket.org:wisemapping/wisemapping-open-source into develop 2023-10-07 10:44:57 -07:00
Paulo Gustavo Veiga
5116a18952 Add database configuration. 2023-10-07 10:44:12 -07:00
Paulo Veiga
3467114a8a README.md edited online with Bitbucket 2023-10-07 17:11:11 +00:00
Paulo Gustavo Veiga
cda97891ba Change format. 2023-10-07 10:07:26 -07:00
Paulo Gustavo Veiga
675802dab7 Remove public and try from index. 2023-08-29 20:14:14 -07:00
Paulo Gustavo Veiga
8b72f75b56 Bump up UI version. 2023-08-28 08:45:35 -07:00
Paulo Gustavo Veiga
e85a670695 Fix embedded view issue. 2023-08-23 08:15:39 -07:00
Paulo Gustavo Veiga
28dc77c501 Bump mail version. 2023-08-16 20:17:29 -07:00
Paulo Gustavo Veiga
c4ae51b50e Add missing dependency. 2023-08-16 19:35:56 -07:00
Paulo Gustavo Veiga
9912897879 Revert "Add mail provider."
This reverts commit 8d3983fd08.
2023-08-16 19:32:17 -07:00
Paulo Gustavo Veiga
8d3983fd08 Add mail provider. 2023-08-16 19:24:16 -07:00
Paulo Gustavo Veiga
169c6e6538 Improve security filters 2023-08-12 18:57:13 -07:00
Paulo Gustavo Veiga
4bb2960716 Increase default_batch_fetch_size 2023-08-11 18:28:50 -07:00
Paulo Gustavo Veiga
70c0b0c532 Update mysql driver. 2023-08-11 18:18:40 -07:00
Paulo Gustavo Veiga
0b96026507 Update tomcat version to 10.1.11-jdk17 2023-08-11 18:08:47 -07:00
Paulo Gustavo Veiga
87712b2493 Fix public map access. 2023-08-10 23:18:59 -07:00
Paulo Gustavo Veiga
c783feef65 Add flavicon on auth exclusion. 2023-08-10 22:46:48 -07:00
Paulo Gustavo Veiga
ea12d0246c Revert pipeline changes. 2023-08-10 22:30:54 -07:00
Paulo Gustavo Veiga
4f94d7117a Update pipeline docker image. 2023-08-10 21:57:27 -07:00
Paulo Gustavo Veiga
abcd0d8515 Add spring messages. 2023-08-10 21:42:03 -07:00
Paulo Gustavo Veiga
1742b268a9 Fix log level on docker image. 2023-08-10 21:34:11 -07:00
Paulo Gustavo Veiga
aaa8d5f0f3 Update tomcat version. 2023-08-10 21:27:37 -07:00
Paulo Gustavo Veiga
553688b070 Refactor variable properties. 2023-08-06 21:57:26 -07:00
Paulo Gustavo Veiga
d2788ae00e Fix logger 2023-08-06 21:51:07 -07:00
Paulo Gustavo Veiga
d4840b9c20 Fix logger 2023-08-06 21:48:10 -07:00
Paulo Gustavo Veiga
b8601d7029 Fix typo 2023-08-06 20:35:42 -07:00
Paulo Gustavo Veiga
86682ca7d8 Fix base closing tag. 2023-08-06 20:02:30 -07:00
Paulo Gustavo Veiga
762ebabe7e Define plugin version. 2023-08-06 17:34:27 -07:00
Paulo Gustavo Veiga
30b2e7e8eb Define compiler version. 2023-08-06 17:31:35 -07:00
Paulo Gustavo Veiga
5844663701 Merge branch 'develop' of bitbucket.org:wisemapping/wisemapping-open-source into develop 2023-08-01 22:17:15 -07:00
Paulo Veiga
55c5126d95 Merged feature/update_spring into develop
* Migrate authentication to beans.
* Fix test execution
* Update to java 17
* Fix failing tests.
* Fix java 17 migration warnings
* Move error page to react.
* Remove Tiles !!!!
* Fix hibernate warning
* Update to jslt 3.0.1
* Bump version.
2023-08-01 04:32:51 +00:00
Paulo Gustavo Veiga
734ec3df67 Bump version. 2023-07-31 21:31:56 -07:00
Paulo Gustavo Veiga
40afd70780 Update to jslt 3.0.1 2023-07-31 21:08:56 -07:00
Paulo Gustavo Veiga
4ebef65728 Fix hibernate warning 2023-07-30 22:50:04 -07:00
Paulo Gustavo Veiga
e55e7e8867 Remove Tiles !!!! 2023-07-30 22:34:31 -07:00
Paulo Gustavo Veiga
1340fff68a Move error page to react. 2023-07-30 22:31:24 -07:00
Paulo Gustavo Veiga
68aa7c20eb Fix java 17 migration warnings 2023-07-30 20:12:11 -07:00
Paulo Gustavo Veiga
963ed70d8d Fix failing tests. 2023-07-30 18:21:25 -07:00
Paulo Gustavo Veiga
0090464d88 Update to java 17 2023-07-30 18:04:45 -07:00
Paulo Gustavo Veiga
53173ec75d Fix test execution 2023-07-28 23:09:44 -07:00
Paulo Gustavo Veiga
a66dff8ae4 Migrate authentication to beans. 2023-07-28 22:46:38 -07:00
Mario Voigt
1d7633b65c Merged in Mario-Voigt/fix-german-translations-1689632224218 (pull request #23)
fix german translations

Approved-by: Paulo Veiga
2023-07-28 05:27:21 +00:00
Paulo Gustavo Veiga
f72b89d59a Update springboot version. 2023-07-02 11:03:19 -07:00
Paulo Gustavo Veiga
30098527b5 Enforce password size limit 2023-07-02 10:13:42 -07:00
Paulo Gustavo Veiga
ae633022ab Fix german translation. 2023-07-02 09:20:49 -07:00
Paulo Gustavo Veiga
6ff203f019 Fix missing resource errors. 2023-07-02 09:18:00 -07:00
Paulo Gustavo Veiga
87bd4bf182 Revert version tomcat 2023-06-29 20:27:33 -07:00
Paulo Gustavo Veiga
fb1de1fcca Update maven image version. 2023-06-29 20:16:25 -07:00
Paulo Gustavo Veiga
fd07ea6102 Update images. 2023-06-29 20:11:48 -07:00
Paulo Gustavo Veiga
046c2af947 Revert docket image publish 2023-06-29 19:46:28 -07:00
Paulo Gustavo Veiga
bb14c0d1c5 update maven-war-plugin fixed. 2023-06-29 18:09:40 -07:00
Paulo Gustavo Veiga
9871ad6843 Multi image generation. 2023-06-28 23:27:20 -07:00
Paulo Gustavo Veiga
33f9eae3cb Update maven-compiler-plugin version. 2023-06-28 23:11:48 -07:00
Paulo Gustavo Veiga
d918f210aa Update maven version. 2023-06-28 23:05:22 -07:00
Paulo Gustavo Veiga
fa6c0bac33 Multi image publish. 2023-06-28 22:33:40 -07:00
Paulo Gustavo Veiga
c41796a54b Fix public view render. 2023-04-06 18:38:49 -07:00
Paulo Gustavo Veiga
e3bcaec5de Fix missing public files on public view render. 2023-04-06 18:38:07 -07:00
Paulo Gustavo Veiga
c2bec7ca4a Revert "Update to tomcat 10.1.7"
This reverts commit 198038f110.
2023-04-01 18:03:04 -07:00
Paulo Gustavo Veiga
198038f110 Update to tomcat 10.1.7 2023-04-01 17:56:18 -07:00
Paulo Gustavo Veiga
df72b64e1b Update docker version. 2023-04-01 17:39:37 -07:00
Paulo Gustavo Veiga
1f59f26c07 Update tomcat version. 2023-04-01 17:35:05 -07:00
Paulo Gustavo Veiga
8c17b4bdcd Update tomcat base version. 2023-04-01 17:23:58 -07:00
Paulo Gustavo Veiga
c92ff3154f Update libraries version. 2023-04-01 16:56:29 -07:00
Paulo Gustavo Veiga
b1805f55b2 Set static distribution version for tomcat. 2023-04-01 16:18:45 -07:00
Paulo Gustavo Veiga
1379a593ae Revert "Revert spring lib update."
This reverts commit 4967a5b930.
2023-04-01 14:39:43 -07:00
Paulo Gustavo Veiga
4967a5b930 Revert spring lib update. 2023-04-01 14:10:51 -07:00
Paulo Gustavo Veiga
02ee11a094 Fix issue https://bitbucket.org/wisemapping/wisemapping-open-source/issues/18/mysql-create-schemassql-error 2023-04-01 13:42:07 -07:00
Paulo Gustavo Veiga
6acde03327 Improve OAuth error handling. 2023-04-01 13:33:15 -07:00
Paulo Gustavo Veiga
7918bc20d0 Improve german translation. 2023-04-01 11:18:00 -07:00
Paulo Gustavo Veiga
11ee64fcf1 Update package version. 2023-02-15 23:30:33 -08:00
Paulo Gustavo Veiga
ca27e37c4b Fix postgress support 2023-02-15 22:47:42 -08:00
Paulo Gustavo Veiga
917442f418 Change default mindmap theme 2023-02-15 19:09:53 -08:00
Paulo Gustavo Veiga
3f00b76bd6 Fix render. 2023-02-03 19:03:14 -08:00
Paulo Gustavo Veiga
0769a511b5 Fix non loading error. 2023-02-03 03:36:51 -08:00
Paulo Gustavo Veiga
c138f7b667 Fix header. 2023-01-31 16:31:54 -08:00
Paulo Gustavo Veiga
ef6d50b26d Support null value on map description. 2023-01-20 19:12:24 -08:00
Paulo Gustavo Veiga
439b237caa Fix adding harcode description. 2023-01-18 21:36:56 -08:00
Paulo Gustavo Veiga
39ff7622f3 Bump up version. 2023-01-02 19:49:07 -08:00
Paulo Gustavo Veiga
766de183eb Release 5.0.19 2023-01-02 19:43:54 -08:00
Paulo Gustavo Veiga
844a3768b0 Minor change. 2022-12-17 17:54:14 -08:00
Paulo Gustavo Veiga
16180f4c6d Minor refactor for oauth.:wq 2022-12-17 17:33:59 -08:00
Gustavo Fuhr
2592d338bb Google Authenticaition support 2022-12-13 02:36:58 +00:00
Paulo Gustavo Veiga
d88e655eee Add postgreSQL driver. 2022-12-05 20:07:35 -08:00
Paulo Gustavo Veiga
6205cba586 Remove ads from public view 2022-12-05 19:55:16 -08:00
Paulo Gustavo Veiga
7f6343bdc8 Load ads after 15 mil 2022-11-20 09:28:38 -08:00
Paulo Gustavo Veiga
ac3f4bed31 Change default font for view. 2022-11-20 07:46:02 -08:00
Paulo Gustavo Veiga
f6a8cbdf38 Optimize font loading. 2022-11-20 07:38:36 -08:00
Paulo Gustavo Veiga
b34eabc800 Specify script async load. 2022-11-20 00:52:19 -08:00
Paulo Gustavo Veiga
72368be54e Fix loading error. 2022-11-20 00:04:15 -08:00
Paulo Gustavo Veiga
da6feccc5b Fix page location. 2022-11-20 00:02:43 -08:00
Paulo Gustavo Veiga
5a79c1ef38 Fix accesiblity errors. 2022-11-20 00:01:16 -08:00
Paulo Gustavo Veiga
ea071562ca Fix zoom and center rendering. 2022-11-19 11:36:09 -08:00
Paulo Gustavo Veiga
4f701d0b74 Fix lighthouse usability errors. 2022-11-14 20:18:34 -08:00
Paulo Gustavo Veiga
34b00a8a7f Add missing password encodder object. 2022-11-12 14:12:19 -08:00
Paulo Gustavo Veiga
11dba85641 Update to tomcat 10 base image. 2022-10-27 22:47:21 -07:00
Paulo Gustavo Veiga
35d8e19c3c Revert "Revert "Update docker base image.""
This reverts commit 16ac1c468d.
2022-10-27 20:44:55 -07:00
Paulo Gustavo Veiga
16ac1c468d Revert "Update docker base image."
This reverts commit 52d6a12e0f.
2022-10-27 20:43:15 -07:00
Paulo Gustavo Veiga
52d6a12e0f Update docker base image. 2022-10-27 20:34:46 -07:00
Paulo Gustavo Veiga
23b0f7351e Resolve several critical vulnerabilities. 2022-10-27 20:28:37 -07:00
Paulo Gustavo Veiga
49732ec06d Update mysql driver version 2022-10-27 19:47:51 -07:00
Paulo Veiga
6c78eb078f Update JDBC drivers. 2022-10-28 02:07:39 +00:00
Paulo Veiga
17e04a6f3f README.md edited online with Bitbucket 2022-10-28 01:54:48 +00:00
Paulo Veiga
59d7ffd9c5 Fix creation table issue. 2022-10-28 01:45:18 +00:00
Paulo Gustavo Veiga
24e2ba93f3 Fix encoding on map title. 2022-10-24 19:02:41 -07:00
Paulo Gustavo Veiga
6cd0f635d5 Fix deleted object would be re-saved by cascade (remove deleted object from associations): [com.wisemapping.model.Collaboration#1651889] 2022-10-21 23:06:04 -07:00
Paulo Gustavo Veiga
4ee62035b8 Update spring framework version. 2022-10-21 18:58:36 -07:00
Paulo Gustavo Veiga
38639e18aa Bump up version. 2022-10-21 18:46:53 -07:00
Paulo Gustavo Veiga
e3a60102fb Update front-end version. 2022-10-21 18:43:08 -07:00
Paulo Gustavo Veiga
7c060ee192 Fix typo 2022-10-21 18:37:33 -07:00
Paulo Gustavo Veiga
2981fe79f7 Rename exception OnwerCollabCannotChangeException 2022-10-21 18:34:55 -07:00
Paulo Gustavo Veiga
c5009e8a07 Add automation for starred. 2022-10-21 17:44:59 -07:00
Paulo Gustavo Veiga
44bb67936b Add starred get endpoint 2022-10-21 17:26:19 -07:00
Paulo Gustavo Veiga
6b220ccb81 Fix bug scape ' on title name. 2022-10-21 16:05:41 -07:00
Paulo Gustavo Veiga
4d8c2aa6cb Inclease session timeout to 24 hs. 2022-10-19 17:36:46 -07:00
Paulo Gustavo Veiga
308092abbd Update MySQL schema 2022-10-18 21:14:49 -07:00
Paulo Gustavo Veiga
b97d5b1a00 Fix removal of maps shared in read-only. 2022-10-05 20:27:41 -07:00
Paulo Gustavo Veiga
ad84282ef8 Remove chache from user. 2022-10-03 21:23:38 -07:00
Paulo Veiga
5b4a6e4c78 Merged editor-with-mui into develop 2022-10-04 01:45:12 +00:00
Paulo Gustavo Veiga
103534475d Fix java.util.ConcurrentModificationException on User creation. 2022-10-03 18:18:30 -07:00
Paulo Gustavo Veiga
2146e2e457 Remove tags. 2022-10-03 16:14:23 -07:00
Paulo Gustavo Veiga
f0531551d7 Add unique to table. 2022-09-28 07:12:13 -07:00
Paulo Gustavo Veiga
e511d5e23d Improve registration code 2022-09-27 21:46:42 -07:00
Paulo Gustavo Veiga
aa6ac9bf7f Fix db error during account creation. 2022-09-27 20:14:32 -07:00
Paulo Gustavo Veiga
5f26874b47 Clean up dependencies on map delete 2022-09-27 18:47:56 -07:00
Paulo Gustavo Veiga
599bc9ec00 Revert NameMatchTransactionAttributeSource mapping. 2022-09-27 17:42:17 -07:00
Paulo Gustavo Veiga
708a42c560 Optimize to avoid single selects on OnToMany in mindmap. 2022-09-26 20:41:48 -07:00
Paulo Gustavo Veiga
86964febc1 Performance optimization to avoid loading Collaboration table per map. 2022-09-26 10:25:23 -07:00
Paulo Gustavo Veiga
0c88b8a474 Change to nexted for transaction propagation. 2022-09-26 08:42:55 -07:00
Paulo Gustavo Veiga
225a913a3a Change PROPAGATION_REQUIRED_NEW option. 2022-09-26 08:24:00 -07:00
Paulo Gustavo Veiga
047c8cce9d Revert condition change. 2022-09-24 09:52:45 -07:00
Paulo Gustavo Veiga
704fb1a880 Workaround to solve maps visibility problem on missing COLLABORATION entry. 2022-09-24 09:37:36 -07:00
Paulo Gustavo Veiga
b5e7389e41 Enable entities cache. 2022-09-24 08:39:11 -07:00
Paulo Gustavo Veiga
39bb8f458b Remove bootstrap for rendering. 2022-09-23 21:04:57 -07:00
Paulo Gustavo Veiga
242906d6d4 Fix layout specification 2022-09-12 21:59:10 -07:00
Paulo Gustavo Veiga
0301c5c63a Lazy loading on public view 2022-09-12 09:59:53 -07:00
Paulo Gustavo Veiga
befb252850 Lazy loading. 2022-09-12 09:46:02 -07:00
Paulo Gustavo Veiga
0c2c6c0b6e Add title to zoom in and zoom out buttons for view only 2022-09-11 16:35:08 -07:00
Paulo Gustavo Veiga
fecd5f3592 Add adds to public view
Add image width and height to icons
2022-09-11 16:23:25 -07:00
Paulo Gustavo Veiga
48eae09985 Update to async font load 2022-09-11 14:20:58 -07:00
Paulo Gustavo Veiga
b431c90758 Optimize font loading. 2022-09-11 13:57:55 -07:00
Paulo Gustavo Veiga
27f64e9feb New snapshot version 2022-09-11 13:28:44 -07:00
Paulo Gustavo Veiga
7af9822777 Complete new release. 2022-09-11 13:20:06 -07:00
Paulo Gustavo Veiga
5f687fa78b Update UI and spring boot dependencies. 2022-09-11 13:15:45 -07:00
Gonzalo Martinez
777a5a5212 Merged in mindplot-webcomponent (pull request #21)
Mindplot webcomponent

* webcomoponent poc in public view

* webcomponent in public view
2022-08-26 01:35:16 +00:00
Paulo Gustavo Veiga
485814f22a Add starred unit test 2022-08-06 16:54:27 -07:00
Paulo Gustavo Veiga
cb2436889b Fix bug cascade remove of label 2022-08-06 16:21:17 -07:00
Alejandro Raiczyk
f7369e33dc Merged in ray_fixes_ios (pull request #20)
center map zoom and position icons in the buttons

* center map zoom and position icons in the buttons
2022-08-05 02:15:05 +00:00
Gonzalo Martinez
edaa4b78f4 Merged in integration-test-incresed-coverage (pull request #19)
Integration test incresed coverage

* batchDelete test implementation

* updatePublishState test implementation

* RestMindmapHistory basic constructor for testing purpose

* fetchMapHistory test implementation

* updateRevertMindmap test implementation

* Coverage report in README

* correction

* updateRevertMindmap test improvement

* addCollab missed branches

* deleteCollab missed branches


Approved-by: Paulo Veiga
2022-07-29 23:19:14 +00:00
Paulo Veiga
8ffb48d095 Update email password for login in documentation. 2022-07-19 02:29:24 +00:00
Gustavo Fuhr
cf0d19de4e Revert change. 2022-07-15 01:00:34 +00:00
Gustavo Fuhr
845fb2f1df Merged in body-size-alternative (pull request #17)
alternative way to set body to fit browser window

* alternative way to set body to fit browser window
2022-07-14 03:12:56 +00:00
Gustavo Fuhr
8554fb7507 Merged in ray-develop (pull request #16)
Ray develop

* fix view and public mode, initial scale and body size

* Merged develop into ray-develop
* root container size now is defined with css

* Merge branch 'ray-develop' of bitbucket.org:wisemapping/wisemapping-open-source into ray-develop


Approved-by: Paulo Veiga
2022-07-09 01:35:06 +00:00
Gustavo Fuhr
a49b870f03 Merged in ray-develop (pull request #14)
PR ray-develop -> develop

* fix view and public mode, initial scale and body size


Approved-by: Paulo Veiga
2022-07-04 22:10:30 +00:00
Paulo Gustavo Veiga
0920dab922 Update readme documentation. 2022-06-29 18:24:42 -07:00
Paulo Gustavo Veiga
c5dca51df9 Simplify GA page title 2022-05-30 09:00:13 -07:00
Paulo Gustavo Veiga
038c4fa6fe Fix url typo 2022-05-29 22:07:38 -07:00
Paulo Gustavo Veiga
b44ace6992 Update GA4 for public 2022-05-29 21:47:44 -07:00
Paulo Gustavo Veiga
1290261966 Update Spring Framework version 2022-05-29 10:27:31 -07:00
Paulo Gustavo Veiga
d831c9d81f Improve control when owner try to be changed. 2022-04-15 00:21:38 -03:00
Paulo Gustavo Veiga
51cfa961e6 Improve handling change of ownner exception. 2022-04-14 16:37:18 -03:00
Paulo Gustavo Veiga
1cabb59b2f Bump up ui version. 2022-04-13 19:23:04 -03:00
Paulo Gustavo Veiga
0f1e0d29f2 Add support for base url configuration 2022-04-13 19:16:51 -03:00
Paulo Gustavo Veiga
deb4cf498a Minor fix 2022-04-12 08:27:53 -03:00
Paulo Gustavo Veiga
3732e858b5 Update robot.txt exclusions 2022-04-12 08:26:35 -03:00
Paulo Gustavo Veiga
3e9a5a0b12 Add exclusion list for domains. 2022-04-11 17:50:19 -03:00
Paulo Gustavo Veiga
7af7925610 Add control to limit the number of accounts to share. 2022-04-11 16:58:06 -03:00
Paulo Gustavo Veiga
c6ddadba45 Fix tooltip rendering. 2022-04-11 15:41:13 -03:00
Paulo Gustavo Veiga
50e0069532 Improve email template 2022-04-11 15:09:42 -03:00
Paulo Gustavo Veiga
b0517db79e Bump up version. 2022-04-11 14:51:43 -03:00
Paulo Gustavo Veiga
c76ae8da06 Release 5.0.11 2022-04-11 14:43:24 -03:00
Paulo Gustavo Veiga
b8b63509d0 Configure resources loading encoding. 2022-04-11 14:36:28 -03:00
Paulo Gustavo Veiga
735bb640b6 Minor fix 2022-04-11 10:05:30 -03:00
Paulo Gustavo Veiga
f1cfef8cf0 Improve message translation on email 2022-04-11 10:03:27 -03:00
Paulo Gustavo Veiga
e435cd4666 Fix file encoding issue on emails. 2022-04-11 09:51:15 -03:00
Paulo Gustavo Veiga
08374056cc Disable cache on entitles. 2022-04-04 23:04:57 -03:00
Paulo Gustavo Veiga
86a0a876ca Fix error trying to delete account with labels created. 2022-04-03 22:02:20 -03:00
Paulo Gustavo Veiga
a618849afc Remove REST API application/xml type support 2022-04-02 12:59:54 -03:00
Paulo Gustavo Veiga
ad20d06d19 Update spring framework version. 2022-04-02 12:22:25 -03:00
Paulo Gustavo Veiga
accf252e78 Fix email encodding problem. 2022-03-30 07:50:42 -03:00
Paulo Gustavo Veiga
641bcbbe17 Fix reset passwod issue on message. 2022-03-30 07:45:15 -03:00
Paulo Gustavo Veiga
8248e162fe Enable base url discovery. 2022-03-29 22:41:21 -03:00
Paulo Gustavo Veiga
6f19323292 Add debug information. 2022-03-28 08:15:46 -03:00
Paulo Gustavo Veiga
8a5bd2de94 Remove junit unsed dependency 2022-03-27 22:55:44 -03:00
Paulo Gustavo Veiga
6508b9eb67 Revert jslt scope change 2022-03-27 22:52:08 -03:00
Paulo Gustavo Veiga
1ac332a18e Revert "Exclude version in collition"
This reverts commit e9ff9b36fc.
2022-03-27 22:46:34 -03:00
Paulo Gustavo Veiga
e9ff9b36fc Exclude version in collition 2022-03-27 22:44:53 -03:00
Paulo Gustavo Veiga
5fa6a82b3a Update java dependencies. 2022-03-27 20:05:21 -03:00
Paulo Gustavo Veiga
de5febaf15 Bump up version 2022-03-27 15:04:19 -03:00
Paulo Gustavo Veiga
b4fb536137 Prepare for release 5.0.10 2022-03-27 15:01:50 -03:00
Paulo Gustavo Veiga
86a5b39124 Partial i18n share message. 2022-03-27 14:50:35 -03:00
Paulo Gustavo Veiga
791b99e753 Fix typo 2022-03-27 14:38:50 -03:00
Paulo Gustavo Veiga
d063e4eb20 Translate missing resources. 2022-03-27 14:37:58 -03:00
Paulo Gustavo Veiga
ff2b37f4cf i18n password changed. 2022-03-27 14:29:29 -03:00
Paulo Gustavo Veiga
8989914eb3 Merge branch 'develop' of bitbucket.org:wisemapping/wisemapping-open-source into develop 2022-03-27 07:34:32 -03:00
Paulo Gustavo Veiga
f70f1d89ab Translate welcome email. 2022-03-27 07:32:53 -03:00
Paulo Veiga
50f0dba93a Improve documentation 2022-03-27 00:24:56 +00:00
Paulo Gustavo Veiga
20b2e8f1e8 Improve mindmap format validation. 2022-03-26 21:06:51 -03:00
Paulo Gustavo Veiga
c5c47892cb Improve collab error email report. 2022-03-24 00:14:38 -03:00
Paulo Gustavo Veiga
9d08ad57b9 Fix failing lock test 2022-03-23 23:41:18 -03:00
Paulo Gustavo Veiga
d380b97938 Clean up lock implementation 2022-03-23 23:32:19 -03:00
Paulo Gustavo Veiga
b8eadb7533 Fix unit tests 2022-03-23 10:56:57 -03:00
Paulo Gustavo Veiga
63f83e879d Merge branch 'develop' into feature/lock2 2022-03-22 22:09:00 -03:00
Paulo Gustavo Veiga
0ee642c246 Improve exception un invalid email 2022-03-22 20:44:07 -03:00
Paulo Gustavo Veiga
20a9978577 Improve toString on User class. 2022-03-22 08:53:52 -03:00
Paulo Gustavo Veiga
b18505050a Revert "Fix CSS collition"
This reverts commit f4cf7e623e.
2022-03-22 08:48:09 -03:00
Paulo Gustavo Veiga
f4cf7e623e Fix CSS collition 2022-03-22 08:38:52 -03:00
Paulo Gustavo Veiga
cbdd6ebb47 WIp 2022-03-22 08:35:47 -03:00
Paulo Gustavo Veiga
fdd6fb928b Improve lock logic. 2022-03-17 19:25:33 -03:00
Paulo Gustavo Veiga
340ddcd1ef Update copyright 2022-03-17 18:47:34 -03:00
Paulo Gustavo Veiga
92dd4a7014 Improve lock code. 2022-03-16 23:16:34 -03:00
Paulo Gustavo Veiga
a9d091a187 Improve error handle on security errors. 2022-03-15 10:30:18 -03:00
Paulo Gustavo Veiga
4cab5299c4 Change mapping of securiy exceptions. 2022-03-14 23:33:16 -03:00
Paulo Gustavo Veiga
9d35aa8279 Fix resource in Chinese 2022-03-14 22:56:02 -03:00
Paulo Gustavo Veiga
c769a5fbe7 Fix compilation 2022-03-14 15:08:31 -03:00
Paulo Gustavo Veiga
7ca5bf716f Improve message on lack of permissions to perform map operations 2022-03-14 15:04:15 -03:00
Paulo Gustavo Veiga
e38c1bcc7c Bump up to 5.0.10 2022-03-14 00:09:47 -03:00
Paulo Gustavo Veiga
c978d02514 Release 5.0.9 version 2022-03-14 00:08:31 -03:00
Paulo Gustavo Veiga
c68c43f5d7 Add chinese support 2022-03-13 23:08:19 -03:00
Paulo Gustavo Veiga
5694697c5f Improve exception handling on non permissions 2022-03-09 17:18:14 -08:00
Paulo Gustavo Veiga
d217768b83 Remove unused context variables. 2022-03-09 13:24:41 -08:00
Paulo Gustavo Veiga
d0a03ad2a3 Revert "Git add CORS"
This reverts commit 5c201d40df.
2022-03-06 21:27:06 -08:00
Paulo Gustavo Veiga
ffd976ffe5 Revert "Add header changes on cors"
This reverts commit 297931508a.
2022-03-06 21:26:54 -08:00
Paulo Gustavo Veiga
297931508a Add header changes on cors 2022-03-06 21:10:45 -08:00
Paulo Gustavo Veiga
5c201d40df Git add CORS 2022-03-06 20:47:45 -08:00
Paulo Gustavo Veiga
1acf84de3f Add anonymous to js loading 2022-03-06 20:16:48 -08:00
Paulo Gustavo Veiga
f5fabae644 Clean up JAVA_OPTS variable 2022-02-28 21:17:21 -08:00
Paulo Gustavo Veiga
e0dac73873 Fix NPE on null user. 2022-02-28 21:12:28 -08:00
Paulo Gustavo Veiga
a8e2c74a21 Remove homepage 2022-02-28 14:51:25 -08:00
Paulo Gustavo Veiga
8d5245da5a Fix typo 2022-02-27 15:02:18 -08:00
Paulo Gustavo Veiga
67cc7e586c Rember me redirect on maps on login 2022-02-27 13:16:39 -08:00
Paulo Gustavo Veiga
732127a7a9 Fix to many redirects on remember me 2022-02-27 13:11:55 -08:00
Paulo Gustavo Veiga
b60f5b331f Disable remember me until solve too many redirect problem. 2022-02-27 09:59:03 -08:00
Paulo Gustavo Veiga
82a3e1c793 Extract new relic config 2022-02-27 09:14:30 -08:00
Paulo Gustavo Veiga
402393a9f7 Enable tomcat redirect filter 2022-02-27 09:02:41 -08:00
Paulo Gustavo Veiga
5cdf2d6de2 Bump up version 2022-02-25 20:23:01 -08:00
Paulo Gustavo Veiga
c5f1ca88be Merge branch 'develop' of bitbucket.org:wisemapping/wisemapping-open-source into develop 2022-02-25 06:24:08 -08:00
Paulo Gustavo Veiga
194e858191 Bump up size limit 2022-02-25 06:23:52 -08:00
polly good
6892732389 Merged in ru-locale (pull request #11)
messages_ru.properties

* messages_ru.properties 

Approved-by: Paulo Veiga
2022-02-25 00:45:12 +00:00
Paulo Gustavo Veiga
8b61809bbe Fix css location for bootstrap 2022-02-23 16:36:08 -08:00
Paulo Gustavo Veiga
c3be0b6552 Increase number of nodes supported. 2022-02-23 14:34:55 -08:00
Paulo Gustavo Veiga
ba80f9479c Merge branch 'develop' of bitbucket.org:wisemapping/wisemapping-open-source into develop 2022-02-23 09:51:17 -08:00
Paulo Gustavo Veiga
50fa9d80f5 Improve error message 2022-02-23 09:51:02 -08:00
Paulo Veiga
5bb6f199c3 README.md edited online with Bitbucket 2022-02-23 15:39:06 +00:00
Paulo Gustavo Veiga
31980ca444 Fix version 2022-02-23 07:16:07 -08:00
Paulo Gustavo Veiga
dd8e9e2f5d Bump up version 2022-02-23 07:11:13 -08:00
Paulo Gustavo Veiga
77a1560625 Merge branch 'develop' of bitbucket.org:wisemapping/wisemapping-open-source into develop 2022-02-23 06:58:18 -08:00
Paulo Gustavo Veiga
2cda03e80d Bump up version 2022-02-23 06:53:42 -08:00
Matias Arriola
73b0454d14 Fix error image. 2022-02-23 14:10:56 +00:00
Paulo Gustavo Veiga
fbbd2c43ff Fix marging on view 2022-02-22 18:14:21 -08:00
Paulo Gustavo Veiga
c3f93fdf4a Improve validation of xml mindmaps during save. 2022-02-22 14:17:13 -08:00
Paulo Gustavo Veiga
342099194d Add missing resources 2022-02-21 10:53:34 -08:00
Paulo Gustavo Veiga
0cd62f612b Improve error handling in not public maps. 2022-02-21 09:43:04 -08:00
Paulo Gustavo Veiga
820e268e3e Fix bug on non-existing last modified 2022-02-21 09:08:28 -08:00
Paulo Gustavo Veiga
aa6531efe1 Remove unsed resources. 2022-02-20 22:12:40 -08:00
Paulo Gustavo Veiga
859c3dd927 Clean up styles now that are part of the editor 2022-02-20 21:55:40 -08:00
Matias Arriola
93f3e91cc1 Delete log file
set session-timeout back to 180
2022-02-20 18:38:16 -03:00
Paulo Gustavo Veiga
f7a9804065 Clean up unused url patterns 2022-02-19 19:47:14 -08:00
Paulo Gustavo Veiga
1c8f3bb203 Fix unit tests. 2022-02-19 19:43:50 -08:00
Paulo Gustavo Veiga
6aadb5a363 Complete security filter 2022-02-19 17:21:45 -08:00
Paulo Gustavo Veiga
f2c15d100d Add CSRD to get operations 2022-02-19 15:57:57 -08:00
Paulo Gustavo Veiga
9966412705 Clean up paths 2022-02-19 12:43:35 -08:00
Paulo Gustavo Veiga
e1bd2630aa First steps on csfr impl 2022-02-19 12:39:38 -08:00
Paulo Gustavo Veiga
bea7bea486 Add flush to commit changes. 2022-02-17 18:11:54 -08:00
Paulo Gustavo Veiga
fad7442ffc Clean up code 2022-02-17 17:36:46 -08:00
Paulo Gustavo Veiga
1eab15f8f3 Fix constrain issue. 2022-02-17 17:34:22 -08:00
Paulo Gustavo Veiga
8e080075a0 Add missing image 2022-02-16 19:18:37 -08:00
Paulo Gustavo Veiga
f0f32178c7 Change mail image to png 2022-02-16 19:05:32 -08:00
Paulo Gustavo Veiga
7cf2644fa8 Bump up snapshot version 2022-02-16 18:46:41 -08:00
Paulo Gustavo Veiga
5c18c44a2f Bump up version. 2022-02-16 18:38:56 -08:00
Paulo Gustavo Veiga
f16762636b Chores: remove duplicated code 2022-02-16 18:31:41 -08:00
Paulo Gustavo Veiga
1f99ce3889 Fix sharing of man on new collabs. 2022-02-16 18:29:28 -08:00
Paulo Gustavo Veiga
63cfe44d50 Remove orphan collabs on registration 2022-02-16 18:05:26 -08:00
Paulo Gustavo Veiga
07ad57e3b4 Fix ui download version 2022-02-15 21:05:16 -08:00
Paulo Gustavo Veiga
7fd227d56f Fix version to be downloaded 2022-02-15 21:00:35 -08:00
Paulo Gustavo Veiga
5d7e7f8d30 Parametrize GA key 2022-02-15 20:36:17 -08:00
Paulo Gustavo Veiga
d69373f563 Update GA JS 2022-02-15 19:38:12 -08:00
Paulo Gustavo Veiga
7d7373768f Update dependencies 2022-02-14 20:06:21 -08:00
Paulo Gustavo Veiga
5c0c18eba0 Add email validation on collaborators. 2022-02-14 19:59:36 -08:00
Paulo Gustavo Veiga
188b280bf2 Add ads.txt file. 2022-02-13 21:35:26 -08:00
Paulo Gustavo Veiga
6f205e04ce Add newrelic config 2022-02-13 10:29:28 -08:00
Paulo Gustavo Veiga
ff4c7d2949 Fix distribution 2022-02-13 10:21:56 -08:00
Paulo Gustavo Veiga
fb1755768c Adjust log level 2022-02-13 08:25:09 -08:00
Paulo Gustavo Veiga
c269cd9edb Remove support for admin to remove mindmaps 2022-02-12 12:47:54 -08:00
Paulo Gustavo Veiga
89dd7e0193 Remove hackcode forze of lazy loading. 2022-02-12 12:34:30 -08:00
Paulo Gustavo Veiga
ccc0b10ea0 Improve captch erorr handling on invalid input 2022-02-12 10:33:05 -08:00
Paulo Gustavo Veiga
83cff3f66d Split error message 2022-02-12 09:17:52 -08:00
Paulo Gustavo Veiga
f35d145fb8 Improve JS error loggin 2022-02-12 09:15:18 -08:00
Paulo Gustavo Veiga
609fdd7144 Split error message on browser error. 2022-02-12 08:35:29 -08:00
Paulo Gustavo Veiga
b67cd407a4 Improve captcha error processing. 2022-02-12 08:29:53 -08:00
Paulo Gustavo Veiga
6c808dfc2a Disable ; strict control 2022-02-12 08:04:16 -08:00
Paulo Gustavo Veiga
9af7247072 Fix captcha error list 2022-02-12 07:52:16 -08:00
Paulo Gustavo Veiga
ea1349c518 Clean up code. 2022-02-12 00:33:50 -08:00
Paulo Gustavo Veiga
607418dcf7 Add missing message resource. 2022-02-12 00:27:24 -08:00
Paulo Gustavo Veiga
0da8c73d74 Clean up google analytics initialization 2022-02-12 00:12:03 -08:00
Paulo Gustavo Veiga
cd0ff1dc89 Merge branch 'develop' of bitbucket.org:wisemapping/wisemapping-open-source into develop 2022-02-12 00:04:15 -08:00
Paulo Gustavo Veiga
19ae88e93f Improve JS error loggin 2022-02-12 00:03:55 -08:00
Paulo Veiga
ebea27b3df Update messages_es.properties (POEditor.com) 2022-02-12 06:23:20 +00:00
Paulo Veiga
13f8eb0898 Update messages_de.properties (POEditor.com) 2022-02-12 06:23:18 +00:00
Paulo Veiga
aed943ce5a Update messages_fr.properties (POEditor.com) 2022-02-12 06:23:16 +00:00
Paulo Veiga
d9c7db9c1f Update messages_en.properties (POEditor.com) 2022-02-12 06:23:14 +00:00
Paulo Gustavo Veiga
4f662acefe Bump up version 2022-02-11 18:06:31 -08:00
Paulo Gustavo Veiga
6abc5a9e5e Fix map creation url 2022-02-09 19:13:09 -08:00
Paulo Gustavo Veiga
571895a2b3 Fix label delete 2022-02-09 16:49:48 -08:00
Paulo Gustavo Veiga
62e009b7e4 Fix add label. 2022-02-09 14:17:28 -08:00
Paulo Gustavo Veiga
4e45aea3f9 Bump up version 2022-02-08 17:43:47 -08:00
Paulo Gustavo Veiga
50e09762b2 Revert package version 2022-02-07 21:52:23 -08:00
Paulo Gustavo Veiga
11e4a4a76a Fix keyboard icon position 2022-02-07 19:13:43 -08:00
Paulo Gustavo Veiga
a5cc7f2e5b Bump up version 2022-02-07 18:52:14 -08:00
Paulo Gustavo Veiga
45bdd80f8d Minor fixes 2022-02-06 09:42:36 -08:00
Paulo Gustavo Veiga
afa73b6a44 Remove unsuported languages 2022-02-05 07:31:01 -08:00
Paulo Veiga
e5200d337b Update messages_es.properties (POEditor.com) 2022-02-05 15:28:58 +00:00
Paulo Veiga
ae80d74122 Update messages_de.properties (POEditor.com) 2022-02-05 15:28:56 +00:00
Paulo Veiga
faa0f4cf72 Update messages_fr.properties (POEditor.com) 2022-02-05 15:28:54 +00:00
Paulo Veiga
1c83dd62d6 Update messages_en.properties (POEditor.com) 2022-02-05 15:28:52 +00:00
Paulo Veiga
265d493dfd Update messages_en.properties (POEditor.com) 2022-02-05 15:25:35 +00:00
Paulo Gustavo Veiga
c55025f07f Fix NPE on recapcha validation 2022-02-03 21:27:43 -08:00
Paulo Gustavo Veiga
119eb03f53 Remove notifier to send emails. 2022-02-03 21:02:28 -08:00
Paulo Gustavo Veiga
f68a3ac7bc Fix typo 2022-02-03 19:08:24 -08:00
Paulo Gustavo Veiga
06fbf208ec Add newrelic 2022-02-03 18:57:18 -08:00
Paulo Gustavo Veiga
677bfe8b89 Fix template emails 2022-02-02 22:13:36 -08:00
Paulo Gustavo Veiga
a71f083416 Fix editor page title 2022-01-30 09:55:07 -08:00
Paulo Gustavo Veiga
bcd3384829 Fix history render 2022-01-27 19:06:51 -08:00
Paulo Veiga
45ec4b371f Fix compilation 2022-01-27 19:56:41 +00:00
Paulo Veiga
466163f791 Change default tomcat db storage dir. 2022-01-27 19:49:55 +00:00
Paulo Gustavo Veiga
993b998bfc Merge branch 'develop' of bitbucket.org:wisemapping/wisemapping-open-source into develop 2022-01-26 14:34:58 -08:00
Paulo Gustavo Veiga
aa3d6c556d Update latest ui version 2022-01-26 14:34:40 -08:00
Matias Arriola
5bea640a83 Integrate webapp to mindmap editor with toolbar actions 2022-01-26 22:34:00 +00:00
Paulo Veiga
a0b8bdb924 bitbucket-pipelines.yml edited online with Bitbucket 2022-01-25 16:59:08 +00:00
Paulo Veiga
023d7f39a2 bitbucket-pipelines.yml edited online with Bitbucket 2022-01-25 16:53:00 +00:00
Paulo Gustavo Veiga
8fe80a95d0 Fix typo 2022-01-23 17:09:19 -08:00
Paulo Gustavo Veiga
19e29957c5 Push image during compilation 2022-01-23 17:03:59 -08:00
Paulo Gustavo Veiga
844edf2f61 Fix pipeline 2022-01-23 16:28:16 -08:00
Paulo Gustavo Veiga
83f5a04197 Reorder pipeline 2022-01-23 16:22:31 -08:00
Paulo Gustavo Veiga
82a22af590 Pipeline 2022-01-23 16:14:37 -08:00
Paulo Gustavo Veiga
904b4e8547 Add docker publish 2022-01-23 15:54:57 -08:00
Paulo Gustavo Veiga
058bb4ef1c Fix initialization scripts for docker 2022-01-23 14:55:07 -08:00
Paulo Gustavo Veiga
f25a1279a3 Extract conexion datapool
Please enter the commit message for your changes. Lines starting
2022-01-23 00:56:30 -08:00
Paulo Gustavo Veiga
19354f4ec1 Fix distribution creation 2022-01-22 23:50:20 -08:00
Paulo Gustavo Veiga
5923d514b7 Remove depreacated code 2022-01-22 09:40:47 -08:00
Paulo Gustavo Veiga
eabc55307c Remove lazy initialization from collaboation 2022-01-18 13:19:25 -08:00
Paulo Gustavo Veiga
6307af005c Optimize mindmap list query. 2022-01-18 13:16:39 -08:00
Paulo Gustavo Veiga
f844692e66 Change initializations of Collabs to eager 2022-01-16 22:47:33 -08:00
Paulo Gustavo Veiga
7fc91abe59 Migrate hibernate xml annotation to annotations 2022-01-16 20:01:56 -08:00
Paulo Gustavo Veiga
4668cba3bf Fix url for static 2022-01-14 16:39:20 -08:00
Paulo Gustavo Veiga
202b3dd285 Add support for remote load of .js on viewer 2022-01-12 19:02:08 -08:00
Paulo Gustavo Veiga
75997b11b3 Add support for external CDN references 2022-01-12 16:09:28 -08:00
Paulo Gustavo Veiga
451c181fd6 Update web.xml to servlet 3.0 2022-01-11 20:44:47 -08:00
Paulo Gustavo Veiga
fc182bc69f Additional resources clean up 2022-01-11 19:04:52 -08:00
Paulo Gustavo Veiga
5db0b756bf Fix adsense registration 2022-01-11 19:01:36 -08:00
Paulo Gustavo Veiga
ba71ff848f Clean up unsed resource properties 2022-01-11 18:57:30 -08:00
Paulo Gustavo Veiga
9cba042f70 Add adds support 2022-01-11 18:18:55 -08:00
Paulo Gustavo Veiga
dcc9bdcdef Change adds code. 2022-01-11 13:17:20 -08:00
Paulo Gustavo Veiga
7bab7ccd53 Bump up version 2022-01-11 12:58:33 -08:00
Matias Arriola
d2617f8358 * Move toolbarRight inside toolbar
* Add bootstrap again to avoid popovers and other styles breaking

Approved-by: Paulo Veiga
2022-01-11 14:05:48 +00:00
Paulo Gustavo Veiga
7f8b9a8121 Remove less 2022-01-10 21:13:06 -08:00
Paulo Gustavo Veiga
a6b6d67277 Add link to the icon page 2022-01-10 20:21:44 -08:00
Paulo Gustavo Veiga
decc76015c Improve styles 2022-01-10 19:49:06 -08:00
Paulo Gustavo Veiga
b1b8dde547 Improve error page styling 2022-01-10 19:12:58 -08:00
Paulo Gustavo Veiga
618ea57d17 Fix emails in readme. 2022-01-10 17:04:35 -08:00
Paulo Gustavo Veiga
0f9877e17f Clean up README 2022-01-10 17:01:40 -08:00
Paulo Gustavo Veiga
4a3900c44c Improve README with compilation details 2022-01-10 16:59:52 -08:00
Paulo Gustavo Veiga
a118547523 Clen up unsed classes and resources 2022-01-10 16:51:06 -08:00
Paulo Gustavo Veiga
86b83807f4 Fix Try action support 2022-01-10 16:22:24 -08:00
Paulo Gustavo Veiga
3bac526593 Update toolbar with center position 2022-01-10 12:13:13 -08:00
Paulo Gustavo Veiga
9b5b4b2eda Add publish button to editor 2022-01-08 14:26:36 -08:00
Paulo Gustavo Veiga
897e7d90a5 Fix embedded support. 2022-01-08 10:47:32 -08:00
Paulo Gustavo Veiga
101dbd81c3 Fix public mindmap view including new zoom and style 2022-01-08 10:32:49 -08:00
Paulo Gustavo Veiga
761b2e5ee0 Add account information render 2022-01-07 17:47:53 -08:00
Paulo Gustavo Veiga
965c65e793 Merge branch 'develop' of bitbucket.org:wisemapping/wisemapping-open-source into develop 2022-01-07 10:33:00 -08:00
Paulo Gustavo Veiga
e40330e720 Add new version 2022-01-07 10:32:44 -08:00
Paulo Gustavo Veiga
0f9639fc73 Revert "Remove unused resources."
This reverts commit 006698341c.
2022-01-07 10:31:48 -08:00
Paulo Gustavo Veiga
006698341c Remove unused resources. 2022-01-06 21:24:58 -08:00
Paulo Veiga
b2fe5f220f README.md edited online with Bitbucket 2022-01-05 14:02:06 +00:00
Paulo Veiga
dbf8cee1c5 Procfile edited online with Bitbucket 2022-01-05 05:18:53 +00:00
Paulo Veiga
541e1f9e55 bitbucket-pipelines2.yml edited online with Bitbucket 2022-01-05 05:18:35 +00:00
Paulo Veiga
d64067a5ff phantomjsdriver.log edited online with Bitbucket 2022-01-05 05:18:01 +00:00
Paulo Veiga
b4f53b7633 yarn.lock edited online with Bitbucket 2022-01-05 05:17:45 +00:00
Paulo Veiga
47ca2e3365 setup.sh edited online with Bitbucket 2022-01-05 05:16:43 +00:00
Paulo Veiga
18f109587d Update readme info 2022-01-05 05:14:14 +00:00
Paulo Gustavo Veiga
5c5af9ecfe Remove shade on toolbar 2022-01-04 19:20:40 -08:00
Paulo Gustavo Veiga
e244d694f5 Update Spring dependencies. 2022-01-04 18:20:30 -08:00
Paulo Gustavo Veiga
307d8ea2b8 Remove JAXB, now supporting any version of JAVA 2022-01-04 13:07:05 -08:00
Paulo Gustavo Veiga
758e18dffc Clean up code 2022-01-04 13:00:39 -08:00
Paulo Gustavo Veiga
0885c9e27e Add missing records 2022-01-03 17:39:11 -08:00
Paulo Gustavo Veiga
7153b0b103 Remove transformers 2022-01-03 16:49:28 -08:00
Paulo Gustavo Veiga
ea5e990b76 Fix pipeline 2022-01-03 16:23:20 -08:00
Paulo Gustavo Veiga
2ee4a1bcd0 Update pipeline 2022-01-03 16:22:28 -08:00
Paulo Gustavo Veiga
24941d6e57 Fix pipeline 2022-01-03 16:14:26 -08:00
Paulo Gustavo Veiga
4fb144b63c Fix pipeline 2022-01-03 16:08:03 -08:00
Paulo Gustavo Veiga
6b97736d59 Bump up version 2022-01-03 16:06:18 -08:00
Paulo Gustavo Veiga
628d819325 Move tests to front-end 2021-12-31 09:37:22 -08:00
Paulo Gustavo Veiga
71fefdd8c6 Remove Image export support. It will be moved to the front end. 2021-12-31 09:13:07 -08:00
Paulo Gustavo Veiga
ac7fd7e706 Add image support on toolbar 2021-12-30 22:52:00 -08:00
Paulo Gustavo Veiga
99e5066746 Bump up version 2021-12-30 22:41:45 -08:00
Paulo Gustavo Veiga
c387eca16c Clean up images, now are embeded. 2021-12-30 22:30:22 -08:00
Paulo Gustavo Veiga
c5c95c55d8 Update to latest mindplot version 2021-12-27 23:36:24 -08:00
Paulo Gustavo Veiga
b7d6bcb5d9 Modernize toolbar 2021-12-27 23:28:21 -08:00
Paulo Gustavo Veiga
955a363ce5 Improve public view 2021-12-26 09:23:51 -08:00
Paulo Gustavo Veiga
fbc9a978f2 Working on fixing mindplot loading 2021-12-25 23:30:57 -08:00
Paulo Gustavo Veiga
9cb4018ce4 Fix mindplot public view issue 2021-12-25 22:55:22 -08:00
Paulo Gustavo Veiga
b3e26caee4 Fix major update integrating with external wisemapping frond end 2021-12-24 18:03:23 -08:00
Matias Arriola
76ff1cc83d Merged in feature/docker-docs (pull request #7)
Add docker instructions and minor docs additions

* Add docker folder with docs and docker-compose
Add troubleshooting and docker sections to main README

Approved-by: Paulo Veiga
2021-06-10 00:13:26 +00:00
Paulo Gustavo Veiga
39ff095df7 Remove openid 2020-11-28 15:48:40 -08:00
Paulo Gustavo Veiga
cade40e1a3 Add ads support 2020-11-24 19:50:49 -08:00
Paulo Gustavo Veiga
4e0c621994 Bump up version. 2020-11-23 19:39:34 -08:00
Paulo Gustavo Veiga
23631b8ac3 Merge branch 'master' of bitbucket.org:wisemapping/wisemapping-open-source into develop 2020-11-23 18:55:38 -08:00
Paulo Gustavo Veiga
50eabdebc4 Change pipeline to install 2020-11-23 18:30:21 -08:00
Paulo Gustavo Veiga
e8a246d980 Adjust number of iterations to 12 for BCrypt 2020-11-23 18:27:29 -08:00
Paulo Gustavo Veiga
7a5b4ca75a Fix regression bug. 2020-11-23 18:17:48 -08:00
Paulo Gustavo Veiga
3ef7f6a7f0 Fix create user error. 2020-11-22 17:41:20 -08:00
Paulo Gustavo Veiga
dcd04df8df Update admin password for testing purposes. 2020-11-22 14:41:33 -08:00
Paulo Gustavo Veiga
4c5097a8fc Configure pipeline for build on master. 2020-11-22 13:27:20 -08:00
PauloV
eae4c9b512 Initial Bitbucket Pipelines configuration 2020-11-22 21:19:10 +00:00
Paulo Gustavo Veiga
939478cda5 Bump to 5.0.1-SNAPSHOT 2020-11-22 13:18:03 -08:00
Paulo Gustavo Veiga
ddb7de8c63 Update version 2020-11-22 13:14:05 -08:00
Paulo Gustavo Veiga
306c34d7d5 Fix log level on hibernate.
Fix footer.
2020-11-22 13:12:03 -08:00
Paulo Gustavo Veiga
62fa88cb3e Update favicon 2020-11-22 13:01:26 -08:00
Paulo Gustavo Veiga
3a006f1fbc Fix error on mindmap publish & details 2020-11-22 12:53:35 -08:00
Paulo Gustavo Veiga
64411c6232 Fix wrong query. 2020-11-08 15:42:51 -08:00
Paulo Gustavo Veiga
2a485b71db Copy Sha1 implementationo 2020-11-08 15:29:42 -08:00
Paulo Gustavo Veiga
df88b7d0ff Fix password encription 2020-11-08 13:43:38 -08:00
Paulo Gustavo Veiga
49c459f386 Merge branch 'feature/migration-spring5' of bitbucket.org:wisemapping/wisemapping-open-source into feature/migration-spring5 2020-11-08 13:36:09 -08:00
Paulo Gustavo Veiga
430b30bffb Fix password encoder for compatibility 2020-11-08 12:08:13 -08:00
Paulo Gustavo Veiga
1a524434da Update JDBC drivers for mysql & others... 2020-11-07 18:44:53 -08:00
Paulo Gustavo Veiga
4778433466 Update to tiles 3 version 2020-11-07 14:46:20 -08:00
Paulo Gustavo Veiga
c230fb4f3e Fix ClassNotFound starting Hibernate 2020-11-07 14:42:00 -08:00
Paulo Gustavo Veiga
e4af8acdc2 Initial commit 2020-11-07 11:56:38 -08:00
Paulo Gustavo Veiga
ad9cea069a Support for Java 11 2020-11-06 21:35:54 -08:00
Paulo Gustavo Veiga
542c0c33e0 Disable timestamp control. Issue seems to be related to changes in the JDBC driver. 2020-07-29 12:32:20 -07:00
Paulo Gustavo Veiga
535141c28f Disable timestamp control. Issue seems to be related to changes in the JDBC driver. 2020-07-29 12:30:44 -07:00
Paulo Gustavo Veiga
57a71427c3 Disable brower support check. This was required because the validation is failing with some new version of Chrome. 2020-04-30 21:15:52 -07:00
Paulo Veiga
70a1862351 Bump up version 2018-09-16 18:37:13 -07:00
Paulo Veiga
585b01f7d4 Merge branch 'develop' 2018-09-16 18:29:02 -07:00
Paulo Veiga
b324415c18 Fix test 2018-09-16 18:27:42 -07:00
Paulo Veiga
e138923694 Hack for workaround batik OOM 2018-09-16 18:06:47 -07:00
Paulo Veiga
b89a82760c Update batik 2018-09-16 13:05:11 -07:00
Paulo Veiga
752aff4e5f Fix several minor issues. 2018-09-16 12:29:19 -07:00
Paulo Veiga
146e84d790 Fix bug on based URL generation 2018-09-15 01:25:14 -07:00
Paulo Veiga
936dae2209 Bump up version 2018-09-14 23:16:35 -07:00
Paulo Veiga
0cda5e4d9e Bump up version 2018-09-14 23:15:47 -07:00
Paulo Veiga
c2334df403 Merge branch 'develop' 2018-09-14 23:08:50 -07:00
Paulo Veiga
4234ca7e38 Upgrade Spring version.
Fix failing export tests
2018-09-14 23:08:34 -07:00
Paulo Veiga
57b2e79c0d Update batik library.
Fix sample SVG tests.
2018-09-14 17:33:36 -07:00
Paulo Veiga
8be186d90e Revert "Try push"
This reverts commit f9acc51888.
2018-09-14 13:45:03 -07:00
Paulo Veiga
1068ed499d Try push 2018-09-14 13:44:24 -07:00
Paulo Gustavo Veiga
4824d7643d Return to java 1.7. Why ?. Spring does not like it. 2015-11-02 08:57:21 -03:00
Paulo Gustavo Veiga
5db868bb56 Return to java 1.7 2015-11-02 08:57:12 -03:00
Paulo Gustavo Veiga
a5ee4475e1 Fix typo... 2015-11-01 21:53:38 -03:00
Paulo Gustavo Veiga
2ece0533a0 Merge branch 'develop' of bitbucket.org:wisemapping/wisemapping-open-source into develop 2015-11-01 21:48:58 -03:00
Ezequiel Bergamaschi
2ee977c501 Merge remote-tracking branch 'origin/develop'
Conflicts:
	core-js/pom.xml
	mindplot/pom.xml
	pom.xml
	web2d/pom.xml
	wise-editor/pom.xml
	wise-webapp/pom.xml
2015-10-29 23:06:57 -03:00
Ezequiel Bergamaschi
59c4330f4f zoom factor decreased, fixing some js errors due to legacy code 2015-10-29 22:31:40 -03:00
Ezequiel Bergamaschi
feae417221 rest user has not password set for rest api 2015-08-29 02:14:49 -03:00
Ezequiel Bergamaschi
db0854bed6 fix api rest for get user by email, email was trimmed 2015-08-26 23:38:41 -03:00
Ezequiel Bergamaschi
5bc91379f9 firefox 40+ support 2015-08-26 23:37:49 -03:00
Paulo Gustavo Veiga
4acdc0b994 Minor java 8 refactors. 2015-07-25 13:17:53 -03:00
Paulo Gustavo Veiga
4acc9ec50f Move to Java 1.8. 2015-07-04 11:02:48 -03:00
Mariela Michalek
f414e94fe5 fix focus link editor 2015-05-31 11:12:27 -03:00
Ezequiel Bergamaschi
d15a97ef02 fix error stack not reporting to autolog 2015-05-09 17:30:00 -03:00
Paulo Gustavo Veiga
69a3889ca2 Update lattest version. 2015-05-09 12:10:39 -03:00
Paulo Gustavo Veiga
b722d5035b Finish Docker implementation. 2015-05-09 12:08:53 -03:00
Paulo Gustavo Veiga
cb1ff39d54 Initial version of Dockerfile generation. 2015-05-09 11:02:09 -03:00
Ezequiel Bergamaschi
740de21ea1 adding error stack information to error reporter 2015-05-09 04:55:40 -03:00
Ezequiel Bergamaschi
f57e98309a fix underscorejs.min.map not found 2015-05-09 02:44:28 -03:00
Ezequiel Bergamaschi
ab9576ae61 fix bug WA-794: submitDialogForm not defined issue WA #resolve 2015-05-09 02:43:46 -03:00
Paulo Gustavo Veiga
0d2450d901 Update to new version. 2015-04-29 12:10:53 -07:00
Paulo Gustavo Veiga
7782dea327 Change to 4.0.2 2015-04-29 11:33:32 -07:00
Ezequiel Bergamaschi
3546b3ae82 fix escape key not working in firefox 2015-04-27 23:15:14 -03:00
Ezequiel Bergamaschi
219d7e2efe fix swagger configuration 2015-04-27 01:19:15 -03:00
Ezequiel Bergamaschi
4474d7fb0b WISE-383 #resolve 2015-04-25 01:06:06 -03:00
Ezequiel Bergamaschi
7edf167bfe alignment between submitDialogForm functions implementation 2015-04-24 23:51:54 -03:00
Ezequiel Bergamaschi
0199dee9ef testing bamboo repository polling 2015-04-19 15:07:59 -03:00
Ezequiel Bergamaschi
baa9ad6924 jasmine specs running in mindplot 2015-04-19 14:57:42 -03:00
Ezequiel Bergamaschi
05e8b3e7bb fix bug when clicking cancel button for modal windows 2015-04-19 14:57:12 -03:00
Mariela Michalek
db48ef67f4 fix duplicate insert 2015-04-12 21:14:37 -03:00
Paulo Gustavo Veiga
e7ce96fd30 Merged WISE-436-fixErrorChangingRoleInSharing into develop 2015-04-12 16:11:36 -03:00
Paulo Gustavo Veiga
9caa90db63 Format some .js. 2015-04-12 11:08:30 -03:00
Paulo Gustavo Veiga
113a93f48a Update copyright headers. 2015-04-12 00:15:12 -03:00
Paulo Gustavo Veiga
2f26b19250 Bug WA-57 fixed. #resolve 2015-04-11 19:41:45 -03:00
Claudio Barril
d73ee3b902 sort collabs by id 2015-04-11 16:09:55 -03:00
Claudio Barril
74a05cb7db take away collaboration from collabsToRemove before role edition 2015-04-11 16:09:29 -03:00
Paulo Gustavo Veiga
2914f5b256 Serialize paramters to json to post. 2015-04-10 00:28:45 -03:00
Paulo Gustavo Veiga
15d7ae1c1d Minor fix to unify paths. 2015-04-10 00:07:40 -03:00
Paulo Gustavo Veiga
33b9a679d3 Enable JS error reporting. 2015-04-09 23:37:39 -03:00
Ezequiel Bergamaschi
89772a9e6e Merged in christinaKorger/wisemapping-open-source (pull request #3)
clean-up
2015-04-04 17:09:06 -03:00
Christina Korger
c1cf798e2e Merged wisemapping/wisemapping-open-source into develop 2015-04-04 22:07:07 +02:00
Christina Korger
9d136df1fe revert commit b4b1c6d
Backed out changeset: f1dbc1a70afc
(probable future relevance to image dragging support)

--HG--
branch : clean-up
2015-04-04 20:45:36 +02:00
Ezequiel Bergamaschi
2316459cf1 Bug WISE-421 #resolve 2015-04-03 01:23:50 -03:00
Ezequiel Bergamaschi
4822267970 fixing freemind tests 2015-04-03 00:53:53 -03:00
Ezequiel Bergamaschi
02b9fa83ab Bug WISE-435 #resolve 2015-04-02 17:50:46 -03:00
Christina Korger
f6a80bb8bf Bug/Task WISE-429 fixed: mark publicly used Designer functions as public by
removing '_' for function definition and calls:

_nodeModelToNodeGraph -> nodeModelToNodeGraph
_addRelationship -> addRelationship
_deleteRelationship -> deleteRelationship
_removeTopic -> removeTopic

--HG--
branch : clean-up
2015-03-30 14:10:26 +02:00
Christina Korger
78f1805fd0 Bug/Task WISE-430 fixed: clean-up Designer - remove unused function
addDraggedNode

--HG--
branch : clean-up
2015-03-30 11:41:08 +02:00
Christina Korger
feead16974 Bug/Task WISE-428 fixed: clean-up Designer - remove unused functions
de-/activateKeyboard with calls to non-existing methods

--HG--
branch : clean-up
2015-03-30 11:29:58 +02:00
Christina Korger
90893f70e2 Merged wisemapping/wisemapping-open-source into develop 2015-03-25 09:07:43 +01:00
Ezequiel Bergamaschi
b485086b4e Bug WISE-393 #resolve 2015-03-25 01:36:47 -03:00
Ezequiel Bergamaschi
91a2f22549 Bug WISE-393 fixed: empty commit, see the previous one 2015-03-25 01:34:04 -03:00
Ezequiel Bergamaschi
0ff314a2a0 Fix some browser issues 2015-03-25 01:29:30 -03:00
Paulo Gustavo Veiga
dff870e3ee Improve detection of version in freemind. 2015-03-24 22:30:51 -03:00
Paulo Gustavo Veiga
0e43964428 Bug WISE-423 fixed: Solve map name export. 2015-03-24 21:55:52 -03:00
Paulo Gustavo Veiga
363c902d09 Bug WISE-422 fixed: Fix tests record files. 2015-03-24 21:38:26 -03:00
Paulo Gustavo Veiga
9c2bfac61f Bug WISE-422 fixed: Minor improvement. 2015-03-24 21:36:47 -03:00
Paulo Gustavo Veiga
db9c90c0a2 Bug WISE-422 fixed: Add Safari hack for importing images. 2015-03-24 21:33:13 -03:00
Mariela Michalek
298efc4d20 fix F2 keypress bug 2015-03-24 20:15:01 -03:00
Paulo Gustavo Veiga
f7d58787c8 Merged in christinaKorger/wisemapping-open-source (pull request #2)
add jsdoc to mindplot module
2015-03-24 16:22:11 -03:00
Christina Korger
c298732f64 add jsdoc to mindplot module
--HG--
branch : mindplot_jsdoc
2015-03-23 09:25:54 +01:00
Claudio Barril
a4da6fb7cd allow null value to rgbToHex method 2015-03-08 00:54:34 -03:00
Claudio Barril
268f3cfecf map rgb to hex color in export freemind 2015-03-07 17:34:05 -03:00
Paulo Gustavo Veiga
fe3f3e7752 Increase release version ... 2015-02-21 13:19:19 -03:00
Paulo Gustavo Veiga
eefad1c7f6 Merge branch 'develop'
Conflicts:
	core-js/pom.xml
	mindplot/pom.xml
	pom.xml
	web2d/pom.xml
	wise-editor/pom.xml
	wise-webapp/pom.xml
2015-02-21 13:10:07 -03:00
Ezequiel Bergamaschi
bd04bf2ea4 fixing note edition 2015-02-12 22:58:28 -03:00
Ezequiel Bergamaschi
fd07af4f5f fix keyboard throubles with ie11 2015-02-12 22:57:13 -03:00
Paulo Gustavo Veiga
ba5efdeaad Replace version to the next SNAPSHOT 2015-02-06 23:07:44 -03:00
Paulo Gustavo Veiga
6ce24d39df Merge branch 'develop'
Conflicts:
	core-js/pom.xml
	mindplot/pom.xml
	pom.xml
	web2d/pom.xml
	wise-editor/pom.xml
	wise-webapp/pom.xml
2015-02-06 22:48:58 -03:00
Ezequiel Bergamaschi
8436ad286c bugfixing for keypress events when user wrinting in a topic 2015-02-01 23:44:34 -03:00
Ezequiel Bergamaschi
1708787747 jasmine specs not running for mindplot through maven 2015-02-01 21:37:41 -03:00
Paulo Gustavo Veiga
2a10642188 Add undercorejs.js as dependency. 2015-01-31 23:38:17 -03:00
Paulo Gustavo Veiga
4899d6d9da Fix main version. 2015-01-31 23:22:48 -03:00
Paulo Gustavo Veiga
6396d5faa1 Merge branch 'feature/remove_mootols' into develop 2015-01-31 21:35:52 -03:00
Paulo Gustavo Veiga
62138c905c Move from 3.0.5-SNAPSHOT to 4.0.0-SNAPSHOT 2015-01-31 21:30:12 -03:00
Ezequiel Bergamaschi
2fafbc03a2 fix rows unclickeables when searching maps that are not in the first page 2015-01-31 16:55:16 -03:00
Ezequiel Bergamaschi
a8cb63d0d8 fixing samples 2015-01-31 15:32:09 -03:00
Ezequiel Bergamaschi
687bc582d0 fixing missing symb links && samples 2015-01-31 14:40:10 -03:00
Claudio Barril
4d00c49458 undo jasmine plugin removed from poms 2015-01-11 12:16:47 -03:00
Ezequiel Bergamaschi
596d567ee4 fixing all popover, some hacks 2014-12-27 00:46:19 -03:00
Ezequiel Bergamaschi
4732b13196 fix popover not updated when updating notes 2014-12-27 00:09:01 -03:00
Ezequiel Bergamaschi
2d513f5c85 fix error in pom and add data for accept click events in bootstrap dialogs 2014-12-26 23:13:12 -03:00
Ezequiel Bergamaschi
e38f5dbce6 Merge remote-tracking branch 'origin/develop' into feature/remove_mootols
Conflicts:
	mindplot/src/main/javascript/widget/LinkIconTooltip.js
	pom.xml
2014-12-26 20:13:10 -03:00
Ezequiel Bergamaschi
ed3adb3894 change api for url thumbnails 2014-12-26 20:12:07 -03:00
Ezequiel Bergamaschi
277bd499da change api for url thumbnails 2014-12-26 20:11:41 -03:00
Ezequiel Bergamaschi
bfd00c9649 fixing bugs in shortcuts and modal dialog with errors 2014-12-26 20:01:15 -03:00
Ezequiel Bergamaschi
8a0194c26c remove mootools components 2014-12-26 18:09:30 -03:00
Ezequiel Bergamaschi
b55dd12495 reformat moootools js for develop 2014-12-26 18:08:55 -03:00
Ezequiel Bergamaschi
dc58509a0f still removing .bind(this) usages 2014-12-26 18:07:31 -03:00
Claudio Barril
c1e3d07957 test broken because overlapping (is failing in master) 2014-12-21 14:33:11 -03:00
Claudio Barril
1f1da2a837 fix test name 2014-12-21 14:30:07 -03:00
Claudio Barril
db66cc2c03 fix code style 2014-12-21 14:29:51 -03:00
Paulo Gustavo Veiga
079c649966 Fix typo... 2014-12-16 21:03:19 -03:00
Paulo Gustavo Veiga
8003ef73bf Fix Swagger console base URL location issue. 2014-12-16 00:43:40 -03:00
Claudio Barril
0dbc2f32a6 symmetric test suite 2014-12-14 19:17:48 -03:00
Claudio Barril
0c86d7c3d8 test suite with node constants 2014-12-14 17:36:00 -03:00
Claudio Barril
79f35ecb9a free test migrated to jasmine (only which really works) 2014-12-14 17:35:08 -03:00
Claudio Barril
b80888e9a7 balanced test migrated to jasmine 2014-12-14 17:33:22 -03:00
Paulo Gustavo Veiga
81e9fa2793 Test new release plugin. 2014-12-12 23:28:35 -03:00
Ezequiel Bergamaschi
6dbd19899b adding tests to suite 2014-10-26 18:43:30 -03:00
Ezequiel Bergamaschi
ea0a507044 move bootstrap dir from wise-editor to mindplot 2014-10-26 18:13:02 -03:00
Ezequiel Bergamaschi
04a71f7646 change js for symlink in tests 2014-10-26 18:11:56 -03:00
Ezequiel Bergamaschi
bacd863c07 jasmine framework configured for mindplot 2014-10-26 17:53:57 -03:00
Ezequiel Bergamaschi
bbba2f1f0d adding resource test 2014-10-26 17:53:22 -03:00
Ezequiel Bergamaschi
2a55a1b86c comment tests setup in order to fix the continous build 2014-10-07 01:25:35 -03:00
Ezequiel Bergamaschi
b36fbbbb8d mindplot integrated with jasmine, dummy test uploaded 2014-10-07 01:17:23 -03:00
Ezequiel Bergamaschi
e642567900 some additional assertion 2014-10-07 01:16:56 -03:00
Ezequiel Bergamaschi
ac8581943d symb links for tests 2014-10-07 01:16:41 -03:00
Ezequiel Bergamaschi
5246ecbbf3 remove unless dependency 2014-09-28 16:33:21 -03:00
Ezequiel Bergamaschi
12bfe5fa31 use old jquery version since htmlunit does not support jquery 2.1.0 yet 2014-09-27 15:58:15 -03:00
Ezequiel Bergamaschi
beee696246 adding development jquery source 2014-09-27 15:57:46 -03:00
Ezequiel Bergamaschi
053b0842dd change webDriver since htmlunit throws error with jquery 2014-09-27 15:15:35 -03:00
Ezequiel Bergamaschi
6c4b0fe1e5 unit testing for events 2014-09-27 14:35:49 -03:00
Ezequiel Bergamaschi
d8015c5608 reducing functionality of Events class 2014-09-27 14:35:40 -03:00
Ezequiel Bergamaschi
248efeb717 try change browser version for continuous build 2014-09-26 23:33:18 -03:00
Ezequiel Bergamaschi
0eef0c1f83 Merge branch 'feature/WISE-214-JasmineTests' into feature/remove_mootols 2014-09-26 23:24:47 -03:00
Ezequiel Bergamaschi
2f3cc5fd32 Merge remote-tracking branch 'origin/develop' into feature/remove_mootols
Conflicts:
	mindplot/src/main/javascript/widget/LinkIconTooltip.js
	wise-webapp/src/main/webapp/jsp/mindmapExport.jsp
2014-09-26 23:24:41 -03:00
Ezequiel Bergamaschi
49cba6090a adding jasmine configuration and suite to core-js module 2014-09-26 23:22:37 -03:00
Ezequiel Bergamaschi
dd2d50a95d Merge remote-tracking branch 'origin/develop' into feature/WISE-214-JasmineTests 2014-09-25 03:10:05 -03:00
Ezequiel Bergamaschi
09606bf820 fix thumbnail service is down 2014-09-25 00:18:03 -03:00
Ezequiel Bergamaschi
c3ebde34d7 css bug fixing 2014-09-22 03:37:18 -03:00
Ezequiel Bergamaschi
e249dee600 include js in final war 2014-09-22 03:28:34 -03:00
Ezequiel Bergamaschi
ef84e3fbbd rename js symb link 2014-09-22 03:14:28 -03:00
Paulo Gustavo Veiga
dfaa8ccd89 Fix release version on master. 2014-09-21 22:20:48 -03:00
Paulo Gustavo Veiga
4d89851d1a Update release version to 3.0.4 snapshot 2014-09-21 22:19:21 -03:00
Ezequiel Bergamaschi
6176ac9558 replace old event.control and event.meta by event.ctrlKey and event.metaKey 2014-09-21 18:34:45 -03:00
Mariela Michalek
ac425c6f0d update remove button for editors 2014-09-14 18:32:18 -03:00
Ezequiel Bergamaschi
c78ae247f4 BootstrapDialog improvements and design 2014-09-14 17:45:11 -03:00
Ezequiel Bergamaschi
616b782c5d remove old References to MooDialog 2014-09-14 17:44:50 -03:00
Ezequiel Bergamaschi
234d8cb09d change statix input size by percentage value 2014-09-12 17:09:17 -03:00
Ezequiel Bergamaschi
0cf62d53d0 Revert "Revert "Revert "new header"""
This reverts commit 9844fb156e.

Conflicts:

	wise-webapp/src/main/webapp/jsp/header.jsp
2014-09-12 17:07:22 -03:00
Ezequiel Bergamaschi
f30f8fb0f2 change thumbnails service due to service is down 2014-09-12 02:01:19 -03:00
Ezequiel Bergamaschi
fff432b634 temporary hack for same scrollbar of mindmapList 2014-09-11 16:59:55 -03:00
Ezequiel Bergamaschi
8bdbdae5c9 finishing css bug fixing of custom toolbar items 2014-09-11 16:59:22 -03:00
Ezequiel Bergamaschi
3eca991285 mindmapExport css bug fixing 2014-09-11 15:12:27 -03:00
Mariela Michalek
35e7341654 when dialog is closed, remove divs from dom 2014-09-11 14:42:15 -03:00
Ezequiel Bergamaschi
63b8c32d63 trigger event when dialog is shown to perform custom dialog actions 2014-09-11 14:38:49 -03:00
Ezequiel Bergamaschi
c946742767 fix esc key not working if not focus in modal 2014-09-11 14:38:22 -03:00
Ezequiel Bergamaschi
9fd5c2c8d4 mindmapShare css improvements 2014-09-11 13:04:50 -03:00
Ezequiel Bergamaschi
903d03fdf4 fixing style stuffs 2014-09-11 11:35:31 -03:00
Paulo Gustavo Veiga
e9444f373e Merge branch 'develop' 2014-09-09 22:41:53 -03:00
Claudio Barril
d7ca99a69c really fix share editor (prod bug) 2014-09-09 18:48:51 -03:00
Claudio Barril
3b10674925 fix some issues in share dialog 2014-09-09 17:43:22 -03:00
Claudio Barril
6710fbd9f7 remove duplicates files uploads 2014-09-09 17:42:17 -03:00
Claudio Barril
ea0b7fd8d1 add translation for History in spanish 2014-09-09 17:41:25 -03:00
Claudio Barril
438bb5a7d6 fix view history of maps 2014-09-09 13:50:17 -03:00
Claudio Barril
94f070832c fix first save (wrong timestamp was being taken) 2014-09-09 11:54:48 -03:00
Claudio Barril
9906f46ce6 fix publish panel 2014-09-09 11:19:56 -03:00
Claudio Barril
4581f07daf fix regular expresion in export window 2014-09-09 11:19:20 -03:00
Claudio Barril
69631a11b1 fix content type 2014-09-08 15:51:20 -03:00
Ezequiel Bergamaschi
0cec7c2fec dialogs migration from moodialog to bootstrap 2014-09-08 14:55:34 -03:00
Claudio Barril
77a087277a fix exporter to freemind issues (shape, font styles and font sizes) 2014-09-08 14:36:49 -03:00
Claudio Barril
013a31ca6e Merge remote-tracking branch 'origin/WISE-253-support-freemind-101' into develop 2014-09-07 23:31:57 -03:00
Claudio Barril
b66d15e51f add default to import error manager 2014-09-07 23:16:00 -03:00
Claudio Barril
0447cb995f fix nomenclature test name 2014-09-07 23:15:48 -03:00
Claudio Barril
eadea5e442 freemind constant 2014-09-07 23:15:27 -03:00
Claudio Barril
cb80d5e976 add test for version comparison 2014-09-07 21:02:04 -03:00
Claudio Barril
68b8428439 fixing files to test export 2014-09-07 20:20:03 -03:00
Ezequiel Bergamaschi
0df077d14b mindmap export bug fixing 2014-09-07 20:17:59 -03:00
Ezequiel Bergamaschi
9855e032ef BootstrapDialog.Request implementation using modal body 2014-09-07 20:17:47 -03:00
Claudio Barril
01071a9236 setting default version for freemind export 2014-09-07 20:16:23 -03:00
Claudio Barril
72ee23849f considering possibility of null positions 2014-09-07 20:16:09 -03:00
Claudio Barril
37b2cc7466 remove console printing for debugging 2014-09-07 18:51:19 -03:00
Claudio Barril
bf5ae3b0de hack fix for relationships when import/export for freemind 2014-09-07 16:58:14 -03:00
Claudio Barril
2a121f91d2 fix vertical order when export to freemind versions. 2014-09-07 16:10:06 -03:00
Claudio Barril
26a18ae7d0 support both export versions for freemind (old and new 1.0.1) 2014-09-07 16:06:58 -03:00
Ezequiel Bergamaschi
2459a14c9b BootstrapDialog.Request implementation 2014-09-01 02:45:15 -03:00
Claudio Barril
369f015af2 fix drawn and freemind test 2014-08-30 22:42:28 -03:00
Claudio Barril
43790c1b9a copy parent background color when a sibling or a child is created 2014-08-25 23:58:13 -03:00
Claudio Barril
696ac88330 fix side as first level nodes are drawn 2014-08-25 23:32:17 -03:00
Mariela Michalek
094d08df4d Merge branch 'feature/remove_mootols' of bitbucket.org:wisemapping/wisemapping-open-source into feature/remove_mootols
Conflicts:
	mindplot/src/main/javascript/LinkIcon.js
2014-08-24 16:46:43 -03:00
Claudio Barril
c4a4424364 fixing import dialog, parameters modification and redirect 2014-08-20 23:31:14 -03:00
Claudio Barril
e1a28027db removing comparasion hack and fixing order to compare versions 2014-08-20 23:30:24 -03:00
Ezequiel Bergamaschi
8bfdda82b7 Revert "Revert "new header""
This reverts commit 3d6df8a143.
2014-08-18 21:54:41 -03:00
Ezequiel Bergamaschi
b923e21bce Merge remote-tracking branch 'origin/develop' into feature/remove_mootols
Conflicts:
	wise-editor/src/main/webapp/js/less.js
	wise-webapp/pom.xml
	wise-webapp/src/main/webapp/js/less.js
2014-08-18 21:35:45 -03:00
Ezequiel Bergamaschi
c282a80b5d fix less update and restoring symblinks 2014-08-18 21:23:42 -03:00
Ezequiel Bergamaschi
a6eeecbbf7 Revert "fix alias checking for jetty 9.x"
This reverts commit fff27e1bb7.
2014-08-18 21:10:25 -03:00
Ezequiel Bergamaschi
46fd579933 old jetty pom 2014-08-18 21:09:56 -03:00
Ezequiel Bergamaschi
961865eb6f Revert "removing unnecesary build"
This reverts commit 52cac830ae.
2014-08-18 20:19:59 -03:00
Ezequiel Bergamaschi
91bc92d18b fix save not working for mindmap (bad request) 2014-08-17 19:15:00 -03:00
Ezequiel Bergamaschi
f3c7667359 fix link icon tooltip bug 2014-08-17 17:56:08 -03:00
Mariela Michalek
05e44551a3 hide tooltip when editor is shown 2014-08-03 20:34:30 -03:00
Mariela Michalek
658bbdf135 remove bind from LinkIcon 2014-08-03 20:10:14 -03:00
Mariela Michalek
96aabe5386 remove bind from ImageIcon 2014-08-03 19:55:34 -03:00
Mariela Michalek
b550f7892e remove .bind method from IconGroup 2014-08-03 19:34:25 -03:00
Mariela Michalek
78e05e6aaf update toolbar margin 2014-08-03 19:34:25 -03:00
Ezequiel Bergamaschi
d821db27ba replace last Request by $.ajax 2014-08-03 17:07:48 -03:00
Ezequiel Bergamaschi
8cb45c587f RestPersisnteceManager reimplemented with ajax 2014-08-03 16:50:06 -03:00
Ezequiel Bergamaschi
d41a261897 add missed css boostrap property 2014-08-03 15:24:58 -03:00
Ezequiel Bergamaschi
4705a4e612 adding symlink for bootstrap in wise-webapp 2014-07-29 02:30:51 -03:00
Ezequiel Bergamaschi
8df2441a66 remove wise-webapp bootstrap 2014-07-29 02:30:08 -03:00
Ezequiel Bergamaschi
16e64f7247 copying bootstrap from wise-webapp to wise-editor 2014-07-29 02:25:45 -03:00
Ezequiel Bergamaschi
9549050d3e link icon tooltip as black tooltip 2014-07-28 00:21:06 -03:00
Ezequiel Bergamaschi
07903bd66e link icon tooltip hide on mouse leave 2014-07-28 00:20:32 -03:00
Ezequiel Bergamaschi
2084bb429e reduce popover padding and size 2014-07-27 20:28:15 -03:00
Ezequiel Bergamaschi
f40aaab2ea trying to load pom.xml 2014-07-27 18:25:52 -03:00
Ezequiel Bergamaschi
21e5850ee5 adding js resources to jsp 2014-07-14 02:45:39 -03:00
Ezequiel Bergamaschi
71154ca05a updating some pom versions 2014-07-14 02:43:24 -03:00
Ezequiel Bergamaschi
6ab59967d2 loading dialog added 2014-07-14 00:12:23 -03:00
Ezequiel Bergamaschi
367a6d7cb7 change old addEvent method call by .on() 2014-07-14 00:11:56 -03:00
Ezequiel Bergamaschi
fedef3cbac restore symlink for less.js 2014-07-14 00:11:17 -03:00
Ezequiel Bergamaschi
a6fabc5a5a Merge remote-tracking branch 'origin/develop' into feature/remove_mootols 2014-07-13 02:39:19 -03:00
Ezequiel Bergamaschi
a85d3db2c8 adding hover to icon panel 2014-07-06 01:29:00 -03:00
Ezequiel Bergamaschi
86bbfd7784 ignore winkey on edit topics 2014-07-06 01:16:23 -03:00
Ezequiel Bergamaschi
c3ef872360 adding option to ajax request for debugging 2014-07-06 01:16:08 -03:00
Ezequiel Bergamaschi
fe59b1ce46 removing .bind mootools call (phase 1/2) 2014-07-06 01:15:34 -03:00
Ezequiel Bergamaschi
fb5546111e adding stop propagation for keydown event in bootstrap dialog 2014-07-06 01:06:23 -03:00
Ezequiel Bergamaschi
5432c9c8a4 fix multiline text editor enter not working and begin edit on tiping 2014-06-30 02:42:02 -03:00
Ezequiel Bergamaschi
6ab5597a82 parsing text response manually from ajax request 2014-06-30 00:35:02 -03:00
Paulo Gustavo Veiga
756afef4b6 Bug WISE-242 fixed
Add support for Firefox 3
2014-06-25 21:26:58 -03:00
Ezequiel Bergamaschi
aaf8be2f70 fix local storage manager 2014-06-22 23:46:36 -03:00
Ezequiel Bergamaschi
2166dd9504 Merge remote-tracking branch 'origin/develop' into feature/remove_mootols 2014-06-19 00:49:34 -03:00
Ezequiel Bergamaschi
425ac4a7ad fix alias checking for jetty 9.x 2014-06-19 00:43:10 -03:00
Ezequiel Bergamaschi
9713bd6fa3 remove unless Json.encode method call 2014-06-16 01:36:33 -03:00
Ezequiel Bergamaschi
a6df171798 fix XMLSerializer_Pela appendChild error 2014-06-16 01:36:13 -03:00
Ezequiel Bergamaschi
6fc214551d fix some errors and old mootools syntax 2014-06-16 01:35:57 -03:00
Ezequiel Bergamaschi
144424ffe5 ToolbarNotifier reimplemented 2014-06-16 01:35:34 -03:00
Ezequiel Bergamaschi
aaa28b83b2 change invalid preserveAspectRatio value 2014-06-06 00:10:07 -03:00
Ezequiel Bergamaschi
9491f8d4a0 designer keyboard shortcuts refactor 2014-06-06 00:09:48 -03:00
Ezequiel Bergamaschi
6ebfc1b233 fix NaN problem in group peer 2014-06-04 00:37:20 -03:00
Ezequiel Bergamaschi
9641e978a6 adding wisemapping service script 2014-05-26 00:19:10 -03:00
Ezequiel Bergamaschi
87b792efdf removing periodical function from mootools 2014-05-22 00:17:34 -03:00
Ezequiel Bergamaschi
153cff8205 removing console logs 2014-05-21 23:53:56 -03:00
Ezequiel Bergamaschi
e6badad763 remove positionRelativeTo method 2014-05-21 23:52:22 -03:00
Ezequiel Bergamaschi
3716b1a3b9 text editor with position done 2014-05-21 23:51:51 -03:00
Ezequiel Bergamaschi
1b7f131602 fixing Options problem 2014-05-16 00:27:57 -03:00
Ezequiel Bergamaschi
f10b14ef5b clean mootools unless classes and methods 2014-05-13 02:23:32 -03:00
Ezequiel Bergamaschi
597205751e extract Options mootools class 2014-05-13 02:23:32 -03:00
Ezequiel Bergamaschi
4b3a00f2e8 fix scrollbar zoom in / zoom out 2014-05-13 02:23:32 -03:00
Ezequiel Bergamaschi
f3dff1b1e6 mousewheel jquery oficial plugin 2014-05-13 02:23:32 -03:00
Ezequiel Bergamaschi
524b0167bf FadeEffect not working but hide and show correctly 2014-05-13 02:23:32 -03:00
Mariela Michalek
1592f3caa7 remove url attr from input 2014-05-10 18:00:07 -03:00
Mariela Michalek
b9ec5b1bf3 update submit functionality on link editor 2014-05-10 17:58:29 -03:00
Mariela Michalek
3a9c9790e9 add "URL_ERROR" in en properties 2014-05-10 17:54:52 -03:00
Mariela Michalek
6d50e0769e add url error BootstrapDialog and LinkEditor 2014-05-04 15:59:12 -03:00
Ezequiel Bergamaschi
30dac452ad note tooltip reimplemented 2014-05-02 18:07:55 -03:00
Ezequiel Bergamaschi
a59c5e7372 LinkIconTooltip reimplemented 2014-05-02 17:55:35 -03:00
Ezequiel Bergamaschi
0ffcbe39b7 WISE-225 fixed 2014-05-02 15:26:27 -03:00
Ezequiel Bergamaschi
3a6a810108 fixme removed 2014-05-02 15:26:01 -03:00
Ezequiel Bergamaschi
382af76753 fix font type tooltip 2014-05-02 01:15:12 -03:00
Ezequiel Bergamaschi
f8fee50076 color palette tooltip reimplemented 2014-05-02 01:00:32 -03:00
Michael Magill
d3b1c9087f I was getting a 404 because it was looking for en_us, not just en. The en template may need to be copied for other English locales like en_GB, en_CA, etc. The 404 only showed up in Firefox's developer console did not appear to affect functionality, so this is just cleanup. 2014-04-29 15:42:31 +00:00
Paulo Gustavo Veiga
35a397c734 Merge branch 'develop' 2014-04-29 11:30:12 -03:00
Michael Magill
bcdc1a1ca4 Syntax error, CHARACTER SET utf8; should have been at the end of the create r_label_mindmap enty, not the bottom of the file. Probably copy and paste error. 2014-04-29 14:23:29 +00:00
Paulo Gustavo Veiga
f2f1db84f8 Merge branch 'develop' 2014-04-29 11:19:18 -03:00
Paulo Gustavo Veiga
5b588d2425 Rename migration script ... 2014-04-29 11:17:20 -03:00
Ezequiel Bergamaschi
ddc5b933ad some css changes.. 2014-04-27 23:59:45 -03:00
Ezequiel Bergamaschi
715d3d49b6 toolbarItem reimplemented 2014-04-27 23:59:35 -03:00
Ezequiel Bergamaschi
107a59132a removing unless parameters on fire event in floating tip 2014-04-27 23:59:01 -03:00
Paulo Gustavo Veiga
d543e09952 Merge branch 'develop' 2014-04-27 12:07:24 -03:00
Paulo Gustavo Veiga
8aea5499d3 Remove all used users for setup. Pending to define data set. 2014-04-27 12:05:49 -03:00
Paulo Gustavo Veiga
aac835a516 Fix SQL names. 2014-04-27 11:13:38 -03:00
Paulo Gustavo Veiga
63cc373817 Merge branch 'develop' 2014-04-26 21:16:57 -03:00
Paulo Gustavo Veiga
86eeb3c6f6 Merge branch 'develop' into feature/WISE-211-iconSupportOnLabels 2014-04-26 21:15:57 -03:00
Paulo Gustavo Veiga
e0d018e1a0 Merge branch 'develop' 2014-04-26 21:11:35 -03:00
Paulo Gustavo Veiga
634cd3e8be Mir fix on label. 2014-04-26 21:08:13 -03:00
Claudio Barril
713a312823 add update for label icon support with tag as default 2014-04-26 18:27:01 -03:00
Paulo Gustavo Veiga
d1a5bd56f9 Merged feature/WISE-211-iconSupportOnLabels into develop 2014-04-26 15:44:36 -03:00
Paulo Gustavo Veiga
78cbf3e307 Merged in ldap-changes (pull request #1)
move 'ou=' from being hardcoded to part of security.ldap.subDn
2014-04-26 15:39:29 -03:00
Michael Magill
1bfbd8ea60 removed "ou=" from LDAP user search since it is now integrated with security.ldap.subDn 2014-04-25 20:41:50 +00:00
Michael Magill
c46f65e23f changed default security.ldap.subDn parameter to include "ou=" 2014-04-25 20:36:48 +00:00
Michael Magill
abd39b604f removed extra / from site.baseurl 2014-04-25 20:30:18 +00:00
Ezequiel Bergamaschi
928d65b024 FloatingTip in ToolbarItem deleted 2014-04-21 00:34:23 -03:00
Ezequiel Bergamaschi
258abc232f fixing some old refs 2014-04-21 00:34:01 -03:00
Ezequiel Bergamaschi
eef8865774 FloatingTip as bootstrap popover 2014-04-20 23:57:39 -03:00
Ezequiel Bergamaschi
200d5c517a KeyboardShortcutTooltip reimplemented 2014-04-19 16:47:11 -03:00
Mariela Michalek
a56850d214 add open link functionality 2014-04-19 16:38:04 -03:00
Mariela Michalek
3ef2cd48b9 refactor note and link editors 2014-04-19 16:28:28 -03:00
Mariela Michalek
86bf506c64 update remove button 2014-04-19 16:25:28 -03:00
Ezequiel Bergamaschi
10ff33be13 fixing wrong reference variable 2014-04-19 14:18:35 -03:00
Paulo Gustavo Veiga
1f61a40e5c Update ads codes. 2014-04-18 19:48:09 -03:00
Paulo Gustavo Veiga
fccbf7b996 Update analitics tracking code. 2014-04-18 19:13:55 -03:00
Mariela Michalek
66e769cab0 set styles 2014-04-18 17:54:24 -03:00
Mariela Michalek
98e798bfce update editors with remove button 2014-04-18 17:13:44 -03:00
Mariela Michalek
e5b5e28843 fade in remove button 2014-04-18 17:12:36 -03:00
Ezequiel Bergamaschi
7ea9da3512 popovers for icons in label icon chooser 2014-04-17 01:29:44 -03:00
Claudio Barril
8b679bae00 fixing tests broken because refactor of label attribute icon 2014-04-16 10:29:36 -03:00
Claudio Barril
96068e05d4 label icon list reduced 2014-04-16 03:00:00 -03:00
Claudio Barril
ff327c5b5c jsp include for label icon list 2014-04-16 02:59:33 -03:00
Claudio Barril
b427747f9a label attribute icon to iconName refactor (because of eze code review) 2014-04-16 02:38:33 -03:00
Claudio Barril
4c54bc5cad adding icon to tags list (when tagging) and some style 2014-04-16 02:25:07 -03:00
Ezequiel Bergamaschi
9d86fdd7e1 adding css for color chooser 2014-04-16 01:57:42 -03:00
Ezequiel Bergamaschi
5206d3b627 removing fixme from dialogForm function 2014-04-16 01:48:09 -03:00
Claudio Barril
0f3d4856d2 fix tests 2014-04-16 00:25:32 -03:00
Claudio Barril
1a7bae563e import label list from another jsp prototype 2014-04-14 18:14:56 -03:00
Claudio Barril
25783d8152 sending icon data to api rest 2014-04-14 18:14:32 -03:00
Claudio Barril
bf26c4c0ef add styles 2014-04-14 18:10:16 -03:00
Claudio Barril
8e7133c4ab add label icons back-end (model and database) 2014-04-14 18:09:34 -03:00
Claudio Barril
725be7ca9b icon ui selection 2014-04-12 19:04:28 -03:00
Claudio Barril
e8567fccf0 icon dropdown creation dialog 2014-04-12 19:04:19 -03:00
Claudio Barril
a0f4024d26 icon message 2014-04-12 19:03:31 -03:00
Mariela Michalek
f401410e81 update accept button 2014-04-12 15:11:39 -03:00
Mariela Michalek
771833e8f2 update editor's events 2014-04-12 15:00:51 -03:00
Mariela Michalek
8dcf0be662 conflict linkEditor 2014-04-10 19:35:39 -03:00
Mariela Michalek
8b396768d5 update bootstrapDialog 2014-04-10 19:33:48 -03:00
Mariela Michalek
3df56a4d97 update editors 2014-04-10 19:33:20 -03:00
Ezequiel Bergamaschi
679f13ebd6 adding configuration for mindplot module 2014-04-10 01:06:50 -03:00
Ezequiel Bergamaschi
45a8bd4454 jasmine maven plugin dependency declared in parent pom 2014-04-10 00:53:48 -03:00
Claudio Barril
df821e754e fix padding and label in two lines 2014-04-09 00:13:38 -03:00
Ezequiel Bergamaschi
51b5907ed5 removing css class 2014-04-06 18:31:28 -03:00
Ezequiel Bergamaschi
87c2f3dcd3 removing custom class .btn-primary, keep bootstrap 2014-04-06 18:24:16 -03:00
Ezequiel Bergamaschi
63959d086a fixing bug 2014-04-03 22:56:11 -03:00
Ezequiel Bergamaschi
363284f5d1 Merge remote-tracking branch 'origin/feature/remove_mootols' into feature/remove_mootols
Conflicts:
	mindplot/src/main/javascript/widget/LinkEditor.js
2014-04-03 22:42:21 -03:00
Ezequiel Bergamaschi
9518fbf6d0 BootstrapDialog and fixing LinkEditor 2014-04-03 22:39:23 -03:00
Mariela Michalek
8823303442 update link and note editor 2014-04-02 15:57:32 -03:00
Mariela Michalek
5d8dc697b0 revert "update bootstrap modal dialog"
This reverts commit 690b653092.
2014-04-02 15:28:59 -03:00
Mariela Michalek
5ce15f6ca5 update bootstrapDialog 2014-04-02 15:19:54 -03:00
Mariela Michalek
a355b7d2a2 update bootstrap dialog 2014-04-01 07:25:22 -03:00
Mariela Michalek
07143af04d update note editor 2014-04-01 07:24:58 -03:00
Mariela Michalek
a11d50909d update link editor 2014-04-01 07:24:36 -03:00
Mariela Michalek
f22c0de2ad update bootstrap modal dialog 2014-04-01 07:24:00 -03:00
Mariela Michalek
423df6057c change compatibility file 2014-04-01 07:15:12 -03:00
Mariela Michalek
0480735330 update linkEditor 2014-03-29 17:13:31 -03:00
Mariela Michalek
32edaef745 update pom - bootstrapDialog 2014-03-29 17:12:51 -03:00
Mariela Michalek
6a8e087c6d add BootstrapDialog 2014-03-29 17:10:52 -03:00
Claudio Barril
6f44429972 update mysql schemas population 2014-03-19 23:29:00 -03:00
Claudio Barril
8da140a67f update hsql schemas population 2014-03-19 23:28:46 -03:00
Ezequiel Bergamaschi
de47b638ac fixing more bugs 2014-03-19 01:51:55 -03:00
Ezequiel Bergamaschi
ccab3bf9ec MultilineTextEditor partially fixed 2014-03-17 03:08:08 -03:00
Ezequiel Bergamaschi
fe4bff17cf fix click outside modal is closing it on wait dialog 2014-03-17 02:15:03 -03:00
Ezequiel Bergamaschi
1708fe0c27 fix wrong jquery call method, replace toggle by trigger for handling events 2014-03-17 02:14:41 -03:00
Ezequiel Bergamaschi
e9f4b0c7d8 replacing old .each mootools' method by _.each 2014-03-17 00:36:29 -03:00
Ezequiel Bergamaschi
2f29dfe203 adding underscorejs library 2014-03-17 00:35:54 -03:00
Ezequiel Bergamaschi
42cedd9aec ColorPalettePanel reimplemented 2014-03-16 22:15:16 -03:00
Ezequiel Bergamaschi
2c59e37bf6 replace old Events class 2014-03-16 22:00:04 -03:00
Ezequiel Bergamaschi
c1c022c96b IconPanel reimplemented 2014-03-16 21:33:56 -03:00
Ezequiel Bergamaschi
6edaf3f30a browser global variable workaround 2014-03-16 18:12:21 -03:00
Ezequiel Bergamaschi
42d22ffcb4 reimplementing persistence managers 2014-03-16 17:05:40 -03:00
Paulo Gustavo Veiga
da9f861333 Remove old test drive configuration. 2014-03-16 12:54:53 -03:00
Paulo Gustavo Veiga
26058e3d81 Merged feature/WISE-220-mindmapListImprovements into develop 2014-03-16 11:34:38 -03:00
Paulo Gustavo Veiga
678e5ff5ce Remove Events class from moootools library. 2014-03-16 11:30:37 -03:00
Ezequiel Bergamaschi
e856260fbb removing fixme 2014-03-15 03:56:10 -03:00
Ezequiel Bergamaschi
95d1c72956 removing todo 2014-03-15 03:55:57 -03:00
Ezequiel Bergamaschi
3309777327 adding Events mootool class 2014-03-15 03:55:42 -03:00
Ezequiel Bergamaschi
1da6082906 ModalDialogNotifier reimplemented 2014-03-15 02:48:28 -03:00
Ezequiel Bergamaschi
e5b9de1cc8 Revert "new header"
This reverts commit 251f0eca46.

Conflicts:

	wise-webapp/src/main/webapp/jsp/header.jsp
2014-03-14 23:59:16 -03:00
Ezequiel Bergamaschi
9ca7b7d8e4 bootstrap 13px 2014-03-14 23:57:23 -03:00
Ezequiel Bergamaschi
9dc195cc4b bootstrap 12px and 13px 2014-03-14 23:48:05 -03:00
Ezequiel Bergamaschi
2a3878faae orange buttons new header 2014-03-13 00:41:45 -03:00
Ezequiel Bergamaschi
9f69c30b25 updating webdefault.xml 2014-03-12 23:42:30 -03:00
Ezequiel Bergamaschi
d29bba4b64 updating jetty version and removing old config 2014-03-12 23:42:20 -03:00
Ezequiel Bergamaschi
5c299bad10 reducing delete dialog size 2014-03-12 01:53:47 -03:00
Ezequiel Bergamaschi
d830fd6f33 bootstrap recompiled with base font size 12px 2014-03-12 01:41:36 -03:00
Ezequiel Bergamaschi
e8e5954cea avoid override bootstrap nav-pills class 2014-03-11 23:43:45 -03:00
Ezequiel Bergamaschi
e6e05e6be3 new header 2014-03-10 01:22:30 -03:00
Ezequiel Bergamaschi
16985ae7d7 rows clickeables 2014-03-10 00:12:49 -03:00
Ezequiel Bergamaschi
2b5c1518f4 css and animation fadeIn 2014-03-09 23:41:39 -03:00
Ezequiel Bergamaschi
c3fd645515 small searcher 2014-03-09 23:41:17 -03:00
Ezequiel Bergamaschi
5ac8e92abd small buttons 2014-03-09 23:41:00 -03:00
Ezequiel Bergamaschi
58be9c0848 Revert "rename parameter"
This reverts commit 29894a276e.
2014-03-09 22:08:46 -03:00
Ezequiel Bergamaschi
67ceede236 using bootstrap for modal loading dialog 2014-03-09 20:50:41 -03:00
Ezequiel Bergamaschi
2ec17259e8 working on loading dialog 2014-03-09 05:50:52 -03:00
Claudio Barril
73f48b6de5 force linkLabel to use view security in mindmap service 2014-03-09 02:34:20 -03:00
Claudio Barril
d7cfa0de04 renaming method addLabel to linkLabel 2014-03-09 02:34:20 -03:00
Ezequiel Bergamaschi
907a808151 hotkeys enter issue fixed 2014-03-09 02:00:16 -03:00
Ezequiel Bergamaschi
c674186e05 reimplementing shortcuts 2014-03-09 01:46:05 -03:00
Ezequiel Bergamaschi
a26fbed276 Dummy Keyboard class 2014-03-09 01:45:53 -03:00
Ezequiel Bergamaschi
a96df13658 hotkeys plugin 2014-03-09 01:45:36 -03:00
Paulo Gustavo Veiga
e229ed96e4 Merged WISE-217-fixMindmapsAreShowingOtherUserLabels into develop 2014-03-08 23:58:20 -03:00
Claudio Barril
78859324a1 select only my labels from all mindmap labels 2014-03-08 16:29:43 -03:00
Claudio Barril
c6b7e48d7a rename parameter 2014-03-08 16:29:42 -03:00
Claudio Barril
de515c572c remove unused exception and class 2014-03-08 16:29:42 -03:00
Paulo Gustavo Veiga
d9b7269d29 Start working on editor.html. 2014-03-05 00:55:22 -03:00
Paulo Gustavo Veiga
cb36e97c07 Rename web2d fire event. 2014-03-05 00:45:08 -03:00
Paulo Gustavo Veiga
892c939376 Fix event fore. 2014-03-05 00:38:03 -03:00
Paulo Gustavo Veiga
dea5b727ac Finally viewmode.html render. 2014-03-05 00:14:28 -03:00
Paulo Gustavo Veiga
5710d77bd5 More fixes ... 2014-03-04 23:09:39 -03:00
Paulo Gustavo Veiga
695b8d92e3 Keep fixing issues. 2014-03-04 22:59:39 -03:00
Paulo Gustavo Veiga
f1fa99a85e Keep migration to jQuery ... 2014-03-04 22:48:31 -03:00
Paulo Gustavo Veiga
18d956fa08 Fix workspace. 2014-03-04 21:33:47 -03:00
Paulo Gustavo Veiga
cb2d63de6a Fix font tests. 2014-03-04 21:24:03 -03:00
Paulo Gustavo Veiga
6d08df41f0 Fix text children... 2014-03-04 21:09:59 -03:00
Paulo Gustavo Veiga
4c2d335a2b Replace document.id by Jquery $ 2014-03-04 21:07:52 -03:00
Paulo Gustavo Veiga
d3087a6626 Reduce Mootools components. 2014-03-04 20:47:23 -03:00
Paulo Gustavo Veiga
43d1308f74 Remove Overlay.js ... 2014-03-04 18:27:52 -03:00
Paulo Gustavo Veiga
e38638663e Merge branch 'develop' into feature/remove_mootols 2014-03-04 18:21:54 -03:00
Paulo Gustavo Veiga
135c956406 Merge branch 'feature/WISE-15-mindmapListFolderSupport' into develop 2014-03-04 16:11:52 -03:00
Mariela Michalek
d36c52b40a add new label test 2014-02-25 22:19:52 -03:00
Paulo Gustavo Veiga
dfd5da684b Remove moodialog
Re-implementing message dialog.
Fix several imports.
2014-02-19 03:34:12 -03:00
Paulo Gustavo Veiga
832fe4e957 Remove mootools more dependency. 2014-02-19 03:11:13 -03:00
Paulo Gustavo Veiga
bf82491de8 Remove Hash dependency. 2014-02-19 03:09:24 -03:00
Paulo Gustavo Veiga
8cbc941a70 Add just restricted mootools libraries. 2014-02-19 03:01:32 -03:00
Paulo Gustavo Veiga
949a2f2d4a Fix arrow tests. 2014-02-17 10:43:25 -03:00
Paulo Gustavo Veiga
441b9aab65 Fix several tests. 2014-02-17 10:20:55 -03:00
Paulo Gustavo Veiga
8e1a4e73be Replace $ by document.id for avoid colitions. 2014-02-17 10:16:43 -03:00
Paulo Gustavo Veiga
8ae2ab8fbf Replace $dolar sign. 2014-02-17 10:11:58 -03:00
Paulo Gustavo Veiga
6c20ed025a Fix display lock message. 2014-02-17 09:05:54 -03:00
Ezequiel Bergamaschi
fbea000aad Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport
Conflicts:
	wise-webapp/src/main/webapp/jsp/mindmapList.jsp
2014-02-14 03:54:36 -03:00
Paulo Gustavo Veiga
1c530a0460 Remove console.log messsage. 2014-02-12 14:37:04 -03:00
Paulo Gustavo Veiga
3f478de905 Fix modal dialogs loading ... 2014-02-12 14:37:04 -03:00
Paulo Gustavo Veiga
ad7bde02e3 Move adsense location 2014-02-12 01:00:12 -03:00
Paulo Gustavo Veiga
74a817e63d Fix login color h1. 2014-02-12 00:55:04 -03:00
Paulo Gustavo Veiga
383b9dce22 Reference bootstrap min.
Fin export dialog.
2014-02-12 00:20:06 -03:00
Paulo Gustavo Veiga
d5f658677e Fix no closed div element on account settings. 2014-02-11 23:27:46 -03:00
Paulo Gustavo Veiga
ec9d0470d8 Fix table hover issue. 2014-02-11 21:45:29 -03:00
Ezequiel Bergamaschi
e9ca68732e get label by id with user and validate label exists on link to mindmap 2014-02-11 02:04:09 -03:00
Ezequiel Bergamaschi
c7674825a6 style change.. 2014-02-11 01:36:19 -03:00
Ezequiel Bergamaschi
dfefd6da40 warning in yellow 2014-02-11 01:05:31 -03:00
Ezequiel Bergamaschi
4b4c07c5fe code indendt 2014-02-11 00:48:48 -03:00
Ezequiel Bergamaschi
6299f43067 fix focus on modal 2014-02-11 00:43:20 -03:00
Ezequiel Bergamaschi
c78b8db81c fix color picker on background 2014-02-11 00:43:04 -03:00
Ezequiel Bergamaschi
788cb1ea98 fixing ui 2014-02-11 00:18:46 -03:00
Ezequiel Bergamaschi
6b73dd10b1 Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport
Conflicts:
	wise-webapp/src/main/webapp/jsp/mindmapList.jsp
2014-02-10 22:16:48 -03:00
Paulo Gustavo Veiga
adb0ab4891 Merged WISE-209-new-map-is-not-working-on-ie-10 into develop 2014-02-09 23:11:38 -03:00
Paulo Gustavo Veiga
8996df4cbb More minor fixes. 2014-02-09 22:44:58 -03:00
Paulo Gustavo Veiga
c5932dc0f8 Fix mindmap list navigator toolbar. 2014-02-09 22:14:53 -03:00
Paulo Gustavo Veiga
832fb6ce52 Enable MYSQL display message. 2014-02-09 22:04:01 -03:00
Paulo Gustavo Veiga
bbc380366f Fix login page. 2014-02-09 21:58:23 -03:00
Paulo Gustavo Veiga
95d9414ae3 Change sd to md styles. 2014-02-09 20:12:24 -03:00
Paulo Gustavo Veiga
f339ed777e Merge branch 'release/v3.0.2' of https://bitbucket.org/wisemapping/wisemapping-open-source 2014-01-15 11:03:41 -03:00
1348 changed files with 10423 additions and 161074 deletions

35
.github/workflows/maven.yml vendored Normal file
View File

@@ -0,0 +1,35 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
name: WiseMapping API
on:
push:
branches: [ "develop" ]
pull_request:
branches: [ "develop" ]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: '21'
distribution: 'zulu'
cache: maven
- name: Build with Maven
run: mvn -B clean package --file wise-api/pom.xml
- name: Build the Docker image
run: docker build -t wisemapping/wisemapping-api:latest wise-api
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
#- name: Update dependency graph
# uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6

2
.gitignore vendored
View File

@@ -5,8 +5,10 @@ wisemapping.iws
wisemapping.iml
wisemapping.ids
wise-webapp/wisemapping.log*
wise-webapp/velocity.log
wisemapping.log*
*/.DS_Store
.DS_Store
target
.idea
wise-webapp/src/main/webapp/react/*

15
LICENSE.md Normal file
View File

@@ -0,0 +1,15 @@
# WiseMapping Public License Version 1.0 (WPL)
WiseMapping open source edition is licensed under the WiseMapping Public License Version 1.0. It is basically Apache License Version 2.0 plus the "powered by wisemapping" text requirement on every single page (the "License") unless we authorize you to remove it.
The WiseMapping Public License Version 1.0 ("WPL") consists of the [APACHE LICENSE, VERSION 2.0](http://www.apache.org/licenses/LICENSE-2.0), modified to be specific to WiseMapping, with the Additional Terms in Exhibit B.
Unless Required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and limitations under the License.
## EXHIBIT B - WiseMapping Public License.
Additional Terms applicable to the WiseMapping Public License.
I. Effect.
These additional terms described in this wiseMapping Public License - Additional Terms shall apply to the Covered Code under this License.
II. WiseMapping and "powered by WiseMapping" text.
This License does not grant any rights to use the trademarks "WiseMapping" even if such marks are included in the Original Code or Modifications.
However, in addition to the other notice obligations, unless wisemapping founders authorize you by email not to do it, (1) all copies of the Original Code in Executable and Source Code form must, as a form of attribution of the original author, include on each user interface screen (i) the "powered by WiseMapping" text; and (2) all derivative works and copies of derivative works of the Covered Code in Executable and Source Code form must include on each user interface screen (i) the "powered by WiseMapping" text. In addition, the "powered by WiseMapping" text, as appropriate, must be visible to all users, must appear in each user interface screen, and must be in the same position. When users click on the "powered by WiseMapping" text it must direct them to http://www.wisemapping.com. This obligation shall also apply to any copies or derivative works which are distributed under the alternative terms of Section 3.6 and this obligation must be included in any such license

View File

@@ -1 +0,0 @@
web: java $JAVA_OPTS -Dspring.profiles.active=heroku -jar wise-webapp/target/dependency/jetty-runner.jar --port $PORT wise-webapp/target/*.war

View File

@@ -1,72 +1,89 @@
# Project Information
# WiseMapping Open Source
The goal of this project is to provide a high quality product that can be deployed by educational and academic institutions, private and public companies and anyone who needs to have a mindmapping application. WiseMapping is based on the same code source supporting WiseMapping.com. More info: www.wisemapping.org
WiseMapping is an open-source web-based mind mapping tool that harnesses the potential of Mind Maps by blending together open standards technologies like SVG and React. It is built upon the foundation of the code supporting http://www.wisemapping.com, ensuring reliability and continuity in its development.
## Compiling and Running
# Build and Start Application
### Prerequisites
The following section describes the steps to check out, compile, and start WiseMapping locally. If you are interested in deploying it, I recommend using the already published images https://hub.docker.com/r/wisemapping/wisemapping.
The following products must be installed:
## Prerequisites
* Java Development Kit 7 or higher ([http://www.oracle.com/technetwork/java/javase/downloads/index.html])
* Maven 3.x or higher ([http://maven.apache.org/])
* JDK 21 or higher
* Maven v3.x or higher ([http://maven.apache.org/])
* Yarn v1 or higher
* Node v18 or higher
### Compiling
## Option 1: Quick Start with Docker Compose
WiseMapping uses Maven as packaging and project management. It's composed of 5 maven sub-modules:
The following command line will start WiseMapping locally using HSQLDB in memory for development purposes:
* core-js: Utilities JavaScript classes
* web2d: JavaScript 2D SVG abstraction library used by the mind map editor
* mindplot: JavaScript mindmap designer core
* wise-editor: Mindmap Editor standalone distribution
* wise-webapp: J2EE web application
```
$ mvn -f wise-api/pom.xml package
$ docker compose up --build
```
The full compilation of the project can be performed executing within <project-dir>:
Application will start at http://localhost/c/login. You can login using *test@wisemapping.org* and password *test*
`mvn package`
## Option 2: Start Frontend and Backend API
Once this command is execute, the file <project-dir>/wise-webapp/target/wisemapping*.war will be generated.
### Compile and Start API
### Testing
The previously generated war can be deployed locally executing within the directory <project-dir>/wise-webapp the following command:
```
$ mvn -f wise-api/pom.xml package
$ cd wise-api
$ mvn spring-boot:run
```
`cd wise-webapp;mvn jetty:run-war`
### Compile and Start Frontend
This will start the application on the URL: [http://localhost:8080/wise-webapp/]. Additionally, a file based database is automatically populated with a test user.
You need to checkout https://github.com/wisemapping/wisemapping-frontend first. Then, follow the next steps:
User: test@wisemapping.org
Password: test
```
$ export NODE_OPTIONS=--openssl-legacy-provider
$ export APP_CONFIG_TYPE="file:dev"
## Running the JS only version
$ cd wisemapping-frontend
$ yarn install
$ yarn build
Start by creating the .zip file:
$ cd packages/webapp; yarn start
```
Application will start at http://localhost:3000/c/login. You can login using *test@wisemapping.org* and password *test*
`mvn assembly:assembly -Dmaven.test.skip=true`
# Supportability Matrix
To test the javascript frontend you then do:
## Databases
ruby -rwebrick -e 'WEBrick::HTTPServer.new(:Port=>8000,:DocumentRoot=>".").start'
* MySQL v8 or higher
* PostgreSQL v15 or higher
* Hsqldb v2.7 or higher
Now open a browser using the URL http://localhost:8000/wise-editor/src/main/webapp/
# Configuration
## Members
WiseMapping backend is based on SpringBoot v3 and it's highly customizable. Additional documentation can be found [here](https://docs.spring.io/spring-boot/3.3/reference/features/external-config.html)
### Founders
The perfered option is to extended by overwriting [application.yaml](https://github.com/wisemapping/wisemapping-open-source/blob/develop/wise-api/src/main/resources/application.yml)
* Pablo Luna <pveiga@wisemapping.com>
* Paulo Veiga <pablo@wisemapping.com>
```
$ java -jar target/wisemapping-api.jar --spring.config.additional-location=../../wise-conf/app.yml
```
### Individual Controbutors
For example, this [example](https://github.com/wisemapping/wisemapping-open-source/blob/develop/config/database/postgresql/app-postgresql.yaml) configure PostgreSQL as database.
# Members
## Founders
* Paulo Veiga <pveiga@wisemapping.com>
* Pablo Luna <pablo@wisemapping.com>
## Past Individual Contributors
* Ignacio Manzano
* Ezequiel Bergamaschi <ezequielbergamaschi@gmail.com>
* Claudio Barril <claudiobarril@gmail.com>
### Past Individual Contributors
* Ignacio Manzano
* Nicolas Damonte
## License
The source code is Licensed under the WiseMapping Open License, Version 1.0 (the “License”);
You may obtain a copy of the License at: [https://wisemapping.atlassian.net/wiki/display/WS/License]
You may obtain a copy of the License at: [https://github.com/wisemapping/wisemapping-open-source/blob/develop/LICENSE.md](https://github.com/wisemapping/wisemapping-open-source/blob/develop/LICENSE.md)

45
config/README.md Normal file
View File

@@ -0,0 +1,45 @@
# Database Configuration
## Overview
WiseMapping supports a wide variety of databases. However, we run intensively tests over HSQL and MySQL database.
* HyperSQL: Automatically configured when you compile WiseMapping and It's used primarily for testing. Additionally, the binary distribution already has an instance configured to provide a single click installation.
* MySQL: This version is the most tested database we support. MySQL is the database use in http://www.wisemapping.com and it's the suggested version for production environments.
* PostgreSQL: Scripts are distributed for the creation and configuration of the it. You will find them within "config/postgres" directory in the binary distribution. Additionally, JDBC driver need to be added to the container.
* Others: In spite of the fact that we don't provide yet initialization scripts for others databases, WiseMapping can be deployed in any relational database. Please, contact us if you have any particular question on this area.
* In the following section, you are going to find a detailed explanation how to configure you WiseMapping using MySQL 5.5.
## MySQL Installation
### Prerequisites
* Download and install MySQL. You can download it for free from: http://dev.mysql.com/downloads/
Running SQL Scripts
Inside the WiseMapping binary distribution, you will find a directory "config/mysql". It contains all the SQL script required to configure a new WiseMapping database instance.
You will find 4 scripts:
* create-database.sql: Create all wisemapping database and wisemapping user.
* create-schemas.sql: Create all database tables and index.
* apopulate-schemas.sql: Creates a mind map example and an a test user "test@wisemapping.org" with password "test".
* drop-schemas.sql: Drop all wisemapping tables in case you want to have a fresh installation.
There are a lot of good tools you can use to run this scripts (eg: MySQLWorkbench). However, the simples way is to use the command line tool that is distributed as part of the MySQL installation.
If you are one brave hearts that is not afraid of the command line tools, open a terminar and execute the following lines:
~~~~
cd <WISEMAPPING-DIR>/config/database/mysql
# Default MySQL installation creates a "root" user with empty password. You can connect to the database with this user if you are # logged in same machine where the database is installed and must be executed logged as "root"
#
# If you have changed the default database "root" password , you need to specify an additional -p parameter and provide the
# new password.
mysql -uroot < create-database.sql
# Create tables and default tests user
mysql -uwisemapping -Dwisemapping -ppassword < create-schemas.sql
mysql -uwisemapping -Dwisemapping -ppassword < apopulate-schemas.sql
~~~~
Great, you have configured you database !. Let's configure WiseMapping now.

View File

@@ -1,27 +0,0 @@
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (1, 'test@wisemapping.org', CURDATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (1, 'Test', 'User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3', 1237, CURDATE(), 1,'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (2, 'admin@wisemapping.org', CURDATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (2, 'Admin', 'User', 'admin', 1237, CURDATE(), 1,'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (3, 'homer@wisemapping.org', CURDATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (3, 'Homer', 'Simpson', 'homer', 1237, CURDATE(), 1, 'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (4, 'marge@wisemapping.org', CURDATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (4, 'Marge', 'Bouvier', 'marge', 1237, CURDATE(), 1, 'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (5, 'bart@wisemapping.org', CURDATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (5, 'Bart', 'Simpson', 'bart', 1237, CURDATE(), 1, 'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (6, 'lisa@wisemapping.org', CURDATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (6, 'Lisa', 'Simpson', 'lisa', 1237, CURDATE(), 1, 'D');
COMMIT;
SHUTDOWN;

View File

@@ -1,95 +0,0 @@
CREATE TABLE COLLABORATOR (
id INTEGER NOT NULL IDENTITY,
email VARCHAR(255) NOT NULL,
creation_date DATE
);
CREATE TABLE USER (
colaborator_id INTEGER NOT NULL IDENTITY,
authentication_type CHAR(1) NOT NULL,
authenticator_uri VARCHAR(255) NULL,
firstname VARCHAR(255) NOT NULL,
lastname VARCHAR(255) NOT NULL,
password VARCHAR(255) NOT NULL,
activation_code BIGINT NOT NULL,
activation_date DATE,
allow_send_email CHAR(1) NOT NULL,
locale VARCHAR(5),
FOREIGN KEY (colaborator_id) REFERENCES COLLABORATOR (id)
);
CREATE TABLE MINDMAP (
id INTEGER NOT NULL IDENTITY,
title VARCHAR(255) NOT NULL,
description VARCHAR(255) NOT NULL,
xml LONGVARBINARY NOT NULL,
public BOOLEAN NOT NULL,
creation_date DATETIME,
edition_date DATETIME,
creator_id INTEGER NOT NULL,
tags VARCHAR(1014),
last_editor_id INTEGER NOT NULL
--FOREIGN KEY(creator_id) REFERENCES USER(colaborator_id)
);
CREATE TABLE LABEL (
id INTEGER NOT NULL PRIMARY KEY IDENTITY,
title VARCHAR(30),
creator_id INTEGER NOT NULL,
parent_label_id INTEGER,
color VARCHAR(7) NOT NULL
--FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id)
);
CREATE TABLE R_LABEL_MINDMAP (
mindmap_id INTEGER NOT NULL,
label_id INTEGER NOT NULL,
PRIMARY KEY (mindmap_id, label_id),
FOREIGN KEY (mindmap_id) REFERENCES MINDMAP (id),
FOREIGN KEY (label_id) REFERENCES LABEL (id) ON DELETE CASCADE ON UPDATE NO ACTION
);
CREATE TABLE MINDMAP_HISTORY (
id INTEGER NOT NULL IDENTITY,
xml LONGVARBINARY NOT NULL,
mindmap_id INTEGER NOT NULL,
creation_date DATETIME,
editor_id INTEGER NOT NULL,
FOREIGN KEY (mindmap_id) REFERENCES MINDMAP (id)
);
CREATE TABLE COLLABORATION_PROPERTIES (
id INTEGER NOT NULL IDENTITY,
starred BOOLEAN NOT NULL,
mindmap_properties VARCHAR(512)
);
CREATE TABLE COLLABORATION (
id INTEGER NOT NULL IDENTITY,
colaborator_id INTEGER NOT NULL,
properties_id INTEGER NOT NULL,
mindmap_id INTEGER NOT NULL,
role_id INTEGER NOT NULL,
FOREIGN KEY (colaborator_id) REFERENCES COLLABORATOR (id),
FOREIGN KEY (mindmap_id) REFERENCES MINDMAP (id),
FOREIGN KEY (properties_id) REFERENCES COLLABORATION_PROPERTIES (id)
);
CREATE TABLE TAG (
id INTEGER NOT NULL IDENTITY,
name VARCHAR(255) NOT NULL,
user_id INTEGER NOT NULL,
--FOREIGN KEY(user_id) REFERENCES USER(colaborator_id)
);
CREATE TABLE ACCESS_AUDITORY (
id INTEGER NOT NULL IDENTITY,
user_id INTEGER NOT NULL,
login_date DATE,
FOREIGN KEY (user_id) REFERENCES USER (colaborator_id)
ON DELETE CASCADE
ON UPDATE NO ACTION
);
COMMIT;

View File

@@ -1,11 +0,0 @@
DROP TABLE IF EXISTS ACCESS_AUDITORY;
DROP TABLE IF EXISTS TAG;
DROP TABLE IF EXISTS COLLABORATION;
DROP TABLE IF EXISTS COLLABORATION_PROPERTIES;
DROP TABLE IF EXISTS MINDMAP_HISTORY;
DROP TABLE IF EXISTS R_LABEL_MINDMAP;
DROP TABLE IF EXISTS LABEL;
DROP TABLE IF EXISTS MINDMAP;
DROP TABLE IF EXISTS USER;
DROP TABLE IF EXISTS COLLABORATOR;
COMMIT;

View File

@@ -0,0 +1,10 @@
RENAME TABLE USER TO ACCOUNT;
RENAME TABLE LABEL TO MINDMAP_LABEL;
ALTER TABLE COLLABORATION
RENAME COLUMN colaborator_id to collaborator_id;
ALTER TABLE ACCOUNT
RENAME COLUMN colaborator_id to collaborator_id;
ALTER TABLE MINDMAP_LABEL DROP COLUMN iconName;

View File

@@ -1,29 +0,0 @@
#
# Command: mysql -u root -p < apopulate_schemas.sql
#
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (1, 'test@wisemapping.org', CURRENT_DATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (1, 'Test', 'User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3', 1237, CURRENT_DATE(), 1,'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (2, 'admin@wisemapping.org', CURRENT_DATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (2, 'Admin', 'User', 'admin', 1237, CURRENT_DATE(), 1,'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (3, 'homer@wisemapping.org', CURRENT_DATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (3, 'Homer', 'Simpson', 'homer', 1237, CURRENT_DATE(), 1, 'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (4, 'marge@wisemapping.org', CURRENT_DATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (4, 'Marge', 'Bouvier', 'marge', 1237, CURRENT_DATE(), 1, 'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (5, 'bart@wisemapping.org', CURRENT_DATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (5, 'Bart', 'Simpson', 'bart', 1237, CURRENT_DATE(), 1, 'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (6, 'lisa@wisemapping.org', CURRENT_DATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (6, 'Lisa', 'Simpson', 'lisa', 1237, CURRENT_DATE(), 1, 'D');
COMMIT;

View File

@@ -0,0 +1,14 @@
spring:
datasource:
url: jdbc:mysql://localhost:3306/wisemapping?useUnicode=yes&characterEncoding=UTF-8
driver-class-name: com.mysql.cj.jdbc.Driver
password: password
username: wisemapping
jpa:
properties:
hibernate:
dialect: org.hibernate.dialect.MySQLDialect
sql:
init:
platform: mysql

View File

@@ -1,10 +1,12 @@
#
# Command: mysql -u root -p < create_database.sql
#
DROP DATABASE IF EXISTS wisemapping;
CREATE DATABASE IF NOT EXISTS wisemapping
CHARACTER SET = 'utf8'
COLLATE = 'utf8_unicode_ci';
GRANT ALL ON wisemapping.* TO 'wisemapping'@'localhost';
SET PASSWORD FOR 'wisemapping'@'localhost' = PASSWORD('password');
#
# Command: mysql -u root -p < create-database.sql
#
DROP DATABASE IF EXISTS wisemapping;
CREATE DATABASE IF NOT EXISTS wisemapping
CHARACTER SET = 'utf8'
COLLATE = 'utf8_unicode_ci';
CREATE USER 'wisemapping'@'%' IDENTIFIED BY 'password';
GRANT ALL PRIVILEGES ON wisemapping.* TO 'wisemapping'@'%' WITH GRANT OPTION;
FLUSH PRIVILEGES;

View File

@@ -1,11 +0,0 @@
DROP TABLE IF EXISTS TAG;
DROP TABLE IF EXISTS ACCESS_AUDITORY;
DROP TABLE IF EXISTS COLLABORATION;
DROP TABLE IF EXISTS COLLABORATION_PROPERTIES;
DROP TABLE IF EXISTS MINDMAP_HISTORY;
DROP TABLE IF EXISTS LABEL;
DROP TABLE IF EXISTS MINDMAP;
DROP TABLE IF EXISTS R_LABEL_MINDMAP
DROP TABLE IF EXISTS USER;
DROP TABLE IF EXISTS COLLABORATOR;
COMMIT;

View File

@@ -1,57 +0,0 @@
CREATE TABLE COLLABORATION_PROPERTIES (
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
starred BOOL NOT NULL DEFAULT 0,
mindmap_properties VARCHAR(512)
CHARACTER SET utf8
)
CHARACTER SET utf8;
DROP TABLE `MINDMAP_NATIVE`;
ALTER TABLE `MINDMAP_COLABORATOR` RENAME TO `COLLABORATION`;
ALTER TABLE `COLABORATOR` RENAME TO `COLLABORATOR`;
ALTER TABLE `MINDMAP` DROP COLUMN `editor_properties`, DROP COLUMN `mindMapNative_id`;
ALTER TABLE `MINDMAP` CHANGE COLUMN `owner_id` `creator_id` INT(11) NOT NULL
, DROP INDEX `owner_id`
, ADD INDEX `owner_id` (`creator_id` ASC);
ALTER TABLE `COLLABORATION` ADD COLUMN `properties_id` INT(11) NULL DEFAULT NULL
AFTER `role_id`;
DROP TABLE USER_LOGIN;
CREATE TABLE ACCESS_AUDITORY (
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
user_id INTEGER NOT NULL,
login_date DATE
)
CHARACTER SET utf8;
#ALTER TABLE ACCESS_AUDITORY
# ADD CONSTRAINT `user_id`
# FOREIGN KEY ()
# REFERENCES `USER` ()
# ON DELETE CASCADE
# ON UPDATE NO ACTION
#, ADD INDEX `user_id` () ;
ALTER TABLE `MINDMAP_HISTORY` DROP COLUMN `creator_user`, ADD COLUMN `editor_id` INT(11) NULL DEFAULT NULL AFTER `creation_date`;
ALTER TABLE `USER` ADD COLUMN `locale` VARCHAR(5) NULL
AFTER `allowSendEmail`;
ALTER TABLE `MINDMAP` DROP COLUMN `last_editor`, ADD COLUMN `last_editor_id` INT(11) NULL DEFAULT 2
AFTER `tags`;
ALTER TABLE `USER` DROP COLUMN `username`, CHANGE COLUMN `activationCode` `activation_code` BIGINT(20) NOT NULL, CHANGE COLUMN `allowSendEmail` `allow_send_email` CHAR(1) NOT NULL DEFAULT '0';
INSERT INTO `MINDMAP` (`last_editor_id`) VALUES (1);
INSERT INTO `COLLABORATOR` (`id`, `email`, `creation_date`) VALUES (8081, 'migfake@wis.com', '2007-10-09');
DELETE FROM `USER`
WHERE activation_date IS null;
DROP TABLE FEEDBACK;
ALTER TABLE `MINDMAP` CHANGE COLUMN `XML` `XML` MEDIUMBLOB NULL DEFAULT NULL;
ALTER TABLE `MINDMAP_HISTORY` CHANGE COLUMN `XML` `XML` MEDIUMBLOB NULL DEFAULT NULL;

View File

@@ -1,5 +0,0 @@
ALTER TABLE `USER` ADD COLUMN `authentication_type` CHAR(1) CHARACTER SET utf8 NOT NULL DEFAULT 'D'
AFTER `colaborator_id`;
ALTER TABLE `USER` ADD COLUMN `authenticator_uri` VARCHAR(255) CHARACTER SET utf8
AFTER `authentication_type`;

View File

@@ -1,34 +0,0 @@
ALTER TABLE `USER` DROP COLUMN `id`;
ALTER TABLE `ACCESS_AUDITORY`
ADD CONSTRAINT
FOREIGN KEY (user_id) REFERENCES USER (colaborator_id)
ON DELETE CASCADE
ON UPDATE NO ACTION;
CREATE TABLE LABEL (
id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
title VARCHAR(30)
CHARACTER SET utf8 NOT NULL,
creator_id INTEGER NOT NULL,
parent_label_id INTEGER,
color VARCHAR(7) NOT NULL,
FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id),
FOREIGN KEY (parent_label_id) REFERENCES LABEL (id)
ON DELETE CASCADE
ON UPDATE NO ACTION
)
CHARACTER SET utf8;
CREATE TABLE R_LABEL_MINDMAP (
mindmap_id INTEGER NOT NULL,
label_id INTEGER NOT NULL,
PRIMARY KEY (mindmap_id, label_id),
FOREIGN KEY (mindmap_id) REFERENCES MINDMAP (id),
FOREIGN KEY (label_id) REFERENCES LABEL (id)
ON DELETE CASCADE
ON UPDATE NO ACTION
)
CHARACTER SET utf8;

View File

@@ -1,3 +0,0 @@
CREATE DATABASE wisemapping;
CREATE USER wisemapping WITH PASSWORD 'password';
GRANT ALL PRIVILEGES ON DATABASE wisemapping TO wisemapping;

View File

@@ -1,11 +0,0 @@
DROP TABLE TAG;
DROP TABLE ACCESS_AUDITORY;
DROP TABLE COLLABORATION;
DROP TABLE COLLABORATION_PROPERTIES;
DROP TABLE MINDMAP_HISTORY;
DROP TABLE R_LABEL_MINDMAP;
DROP TABLE LABEL;
DROP TABLE MINDMAP;
DROP TABLE "user";
DROP TABLE COLLABORATOR;
COMMIT;

View File

@@ -0,0 +1,14 @@
spring:
datasource:
url: jdbc:postgresql://localhost/wisemapping
driver-class-name: org.postgresql.Driver
password: password
username: wisemapping
jpa:
properties:
hibernate:
dialect: org.hibernate.dialect.PostgreSQLDialect
sql:
init:
platform: postgresql

View File

@@ -0,0 +1,7 @@
CREATE DATABASE wisemapping;
CREATE USER wisemapping WITH PASSWORD 'password';
GRANT ALL PRIVILEGES ON DATABASE wisemapping TO wisemapping;
GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO wisemapping;
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO wisemapping;

View File

@@ -1,79 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>core-js</artifactId>
<packaging>jar</packaging>
<name>Core JavaScript Utils Libraries</name>
<parent>
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<relativePath>../pom.xml</relativePath>
<version>3.1-SNAPSHOT</version>
</parent>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>merge-js-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<mkdir dir="${basedir}/target/classes"/>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>compress</goal>
</goals>
<configuration>
<sourceDirectory>src/main/javascript/</sourceDirectory>
<outputDirectory>target/tmp/</outputDirectory>
<aggregations>
<aggregation>
<output>${basedir}/target/classes/core.js</output>
<includes>
<include>${basedir}/target/tmp/header-min.js</include>
<include>${basedir}/target/tmp/Functions-min.js</include>
<include>${basedir}/target/tmp/Utils-min.js</include>
<!-- @Todo:Review this -->
<include>
${basedir}/../mindplot/src/main/javascript/libraries/moodialog/Overlay.js
</include>
<include>
${basedir}/../mindplot/src/main/javascript/libraries/moodialog/MooDialog.js
</include>
<include>
${basedir}/../mindplot/src/main/javascript/libraries/moodialog/MooDialog.Request.js
</include>
<include>
${basedir}/../mindplot/src/main/javascript/libraries/moodialog/MooDialog.Fx.js
</include>
</includes>
</aggregation>
</aggregations>
<nomunge>true</nomunge>
<jswarn>false</jswarn>
<force>true</force>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -1,62 +0,0 @@
/*
Function: $defined
Returns true if the passed in value/object is defined, that means is not null or undefined.
Arguments:
obj - object to inspect
*/
$defined = function (obj) {
return (obj != undefined);
};
$assert = function (assert, message) {
if (!$defined(assert) || !assert) {
logStackTrace();
console.log(message);
throw new Error(message);
}
};
Math.sign = function (value) {
return (value >= 0) ? 1 : -1;
};
function logStackTrace(exception) {
if (!$defined(exception)) {
try {
throw Error("Unexpected Exception");
} catch (e) {
exception = e;
}
}
var result = "";
if (exception.stack) { //Firefox and Chrome...
result = exception.stack;
}
else if (window.opera && exception.message) { //Opera
result = exception.message;
} else { //IE and Safari
result = exception.sourceURL + ': ' + exception.line + "\n\n";
var currentFunction = arguments.callee.caller;
while (currentFunction) {
var fn = currentFunction.toString();
result = result + "\n" + fn;
currentFunction = currentFunction.caller;
}
}
window.errorStack = result;
return result;
}
// Support for Windows ...
if (!window.console) {
console = {
log:function (e) {
}
};
}

View File

@@ -1,61 +0,0 @@
/*
* Copyright [2012] [wisemapping]
*
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
* It is basically the Apache License, Version 2.0 (the "License") plus the
* "powered by wisemapping" text requirement on every single page;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the license at
*
* http://www.wisemapping.org/license
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
core.Utils = {
};
core.Utils.innerXML = function (node) {
// summary:
// Implementation of MS's innerXML function.
if ($defined(node.innerXML)) {
return node.innerXML;
// string
} else if ($defined(node.xml)) {
return node.xml;
// string
} else if ($defined(XMLSerializer)) {
return (new XMLSerializer()).serializeToString(node);
// string
}
};
/**
* Cross-browser implementation of creating an XML document object.
*/
core.Utils.createDocument = function () {
var doc = null;
if ($defined(window.ActiveXObject)) {
//http://blogs.msdn.com/b/xmlteam/archive/2006/10/23/using-the-right-version-of-msxml-in-internet-explorer.aspx
var progIDs = [ 'Msxml2.DOMDocument.6.0', 'Msxml2.DOMDocument.3.0'];
for (var i = 0; i < progIDs.length; i++) {
try {
doc = new ActiveXObject(progIDs[i]);
break;
}
catch (ex) {
}
}
} else if (window.document.implementation && window.document.implementation.createDocument) {
doc = window.document.implementation.createDocument("", "", null);
}
$assert(doc, "Parser could not be instantiated");
return doc;
};

View File

@@ -1,19 +0,0 @@
/*
* Copyright [2012] [wisemapping]
*
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
* It is basically the Apache License, Version 2.0 (the "License") plus the
* "powered by wisemapping" text requirement on every single page;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the license at
*
* http://www.wisemapping.org/license
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
var core = {};

37
distribution/Dockerfile Normal file
View File

@@ -0,0 +1,37 @@
# Dockerizing WiseMapping: Dockerfile for building WiseMapping images
# Based on ubuntu:latest, installs WiseMapping (http://ww.wisemapping.org)
# Based info setup ...
#FROM --platform=$BUILDPLATFORM tomcat:9.0.71-jdk17
FROM tomcat:10.1.11-jdk17
LABEL maintainer="Paulo Gustavo Veiga <pveiga@wisemapping.com>"
# Build variables ...
ARG WEBAPP_TARGET_DIR="/usr/local/tomcat/webapps/ROOT"
ARG DB_BASE_DIR="/var/lib/wisemapping"
# Default ENV configurations ...
ENV JAVA_OPTS="-XX:+PrintFlagsFinal -XX:InitialRAMPercentage=30 -XX:MaxRAMPercentage=80 -Dfile.encoding=UTF-8"
ENV database.base.url=${DB_BASE_DIR}
# Copy wisemapping distribution ...
COPY wisemapping.war /tmp
RUN mkdir ${WEBAPP_TARGET_DIR}
RUN cd ${WEBAPP_TARGET_DIR} && jar -xvf /tmp/wisemapping.war
RUN rm /tmp/wisemapping.war
# Change logger to
RUN cp ${WEBAPP_TARGET_DIR}/WEB-INF/log4j2-stdout.xml ${WEBAPP_TARGET_DIR}/WEB-INF/classes/log4j2.xml
# Add support for proxy
RUN sed -i 's|\
</Host>|\
<Valve className="org.apache.catalina.valves.RemoteIpValve" \
remoteIpHeader="X-Forwarded-For" \
protocolHeader="X-Forwarded-Proto"/>\
</Host>|' \
/usr/local/tomcat/conf/server.xml
# Copy default HSQL DB for testing ...
RUN mkdir -p ${DB_BASE_DIR}/db
COPY db/ ${DB_BASE_DIR}/db

59
distribution/README.md Normal file
View File

@@ -0,0 +1,59 @@
# What is WiseMapping ?
Wise Mapping is the web mind mapping open source tool that leverages the power of Mind Maps mixing open standards technologies such as SVG and React.
WiseMapping is based on the same code product supporting [http://www.wisemapping.com].
# How to use this image.
There are multiple ways to run WiseMapping depending on your database configuration preference
## Option 1: Running HSQL within the image storage
> $ docker run -it --rm -p 8080:8080 wisemapping/wisemapping:latest
Then, open your browser at `http://localhost:8888`. A default user is available for testing `test@wisemapping.org` and password `test`.
***This option, all changes will be lost once the image is stopped. Use it for testing only***
## Option 2: Running HSQL with mounted directory
Only one time, copy the empty default out of the container:
> $ mkdir your- db-dir-store-path
>
> $ docker run --name wiseapp -d --mount type=bind,source=your-db-dir-store-path,target=/var/lib/wise-db wisemapping/wisemapping:latest
>
> $ docker cp wiseapp:/var/lib/wisemapping/db your-db-dir-store-path
>
> $ docker stop wiseapp;docker rm wiseapp
Then, execute the container mounting tbe directory:
> $ docker run --mount type=bind,source=your-db-dir-store-path/db,target=/var/lib/wisemapping/db -it --rm -p 8080:8080 wisemapping/wisemapping:latest
## Option 3: External MySQL/PostgreSQL
### Setup database
Depending on the database your want to configure, you can create initialization scripts [here](https://bitbucket.org/wisemapping/wisemapping-open-source/src/develop/config/database/)
### Configure application properties
The next step is configure the WiseMapping for the database and credentials.
Download `app.properties` configuration file and configure the required sections:
> $ curl https://bitbucket.org/wisemapping/wisemapping-open-source/src/master/wise-webapp/src/main/webapp/WEB-INF/app.properties
### Starting the application
Run the application mounting your previously configured `app.properties`
> $ docker run --mount type=bind,source=your-file-path/app.properties,target=/usr/local/tomcat/webapps/ROOT/WEB-INF/app.properties -it --rm -p 8080:8080 wisemapping/wisemapping:latest
# Advanced configuration
## Increase Tomcat memory
> docker run\
> --mount type=bind,source<your-file-path/app.properties,target=/usr/local/tomcat/webapps/ROOT/classes/app.properties
> -m 1.5GB -e JAVA_OPTS=" -XX:+PrintFlagsFinal -XX:InitialRAMPercentage=30 -XX:MaxRAMPercentage=80"
> -it --rm -p 8888:8080 veigap/wisemapping:latest

View File

@@ -1,36 +0,0 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>editor</id>
<formats>
<format>zip</format>
</formats>
<files>
<file>
<source>core-js/target/classes/core.js</source>
<outputDirectory>/js</outputDirectory>
</file>
<file>
<source>mindplot/target/classes/mindplot-min.js</source>
<outputDirectory>/js</outputDirectory>
</file>
</files>
<fileSets>
<fileSet>
<outputDirectory>/</outputDirectory>
<directory>wise-editor/src/main/webapp</directory>
<includes>
<include>css/**/*</include>
<include>images/**/*</include>
<include>icons/**/*</include>
<include>js/editor.js</include>
<include>js/less*.js</include>
<include>js/mootools*.js</include>
<include>html/editor.html</include>
<include>html/*</include>
<include>samples/*</include>
<include>index.html</include>
</includes>
</fileSet>
</fileSets>
</assembly>

10
distribution/build-image.sh Executable file
View File

@@ -0,0 +1,10 @@
#!/bin/sh
set -o
set -u
mvn -f ../pom.xml clean package
docker build --platform linux/amd64 -t wisemapping/wisemapping:latest -f ./Dockerfile ../wise-webapp/target/
#docker buildx create --use --platform=linux/arm64,linux/amd64 --name multi-platform-builder
#docker buildx inspect --bootstrap
#docker buildx build --platform=linux/amd64,linux/arm64 --push -t wisemapping/wisemapping:latest -f ./Dockerfile ../wise-webapp/target/

View File

@@ -1,64 +0,0 @@
#!/bin/bash
set -e
set -u
WISE_VERSION=$1
BASE_DIR=`pwd`
TARGET_DIR=$BASE_DIR/target
JETTY_DIR=$TARGET_DIR/wisemapping-$WISE_VERSION
WISE_WEBAPP_DIR=$JETTY_DIR/webapps/wisemapping
JETTY_VERSION=8.1.14.v20131031
JETTY_DIST_DIR=jetty-distribution-${JETTY_VERSION}
JETTY_ZIP=${JETTY_DIST_DIR}.zip
# Clean ...
mvn -o -f $BASE_DIR/../pom.xml clean
[ ! -e target ] && mkdir target
rm -fr ${JETTY_DIR}
rm -fr ${TARGET_DIR}/${JETTY_DIST_DIR}
# Prepare resources ..
mvn -o -f $BASE_DIR/../pom.xml package -Dmaven.test.skip=true
if [ ! -f ./target/${JETTY_ZIP} ]
then
echo "Download Jetty"
wget http://download.eclipse.org/jetty/${JETTY_VERSION}/dist/${JETTY_ZIP} -P $TARGET_DIR
fi
echo "Unzip Jetty ...:"
unzip ${TARGET_DIR}/${JETTY_ZIP} -d ${TARGET_DIR}/ > /dev/null
mv ${TARGET_DIR}/${JETTY_DIST_DIR} ${JETTY_DIR}
# Clean unsed files ...
rm -rf $JETTY_DIR/webapps/*
rm -rf $JETTY_DIR/contexts/*
rm -rf $JETTY_DIR/javadoc
# Now, start wise-webapps customization ...
echo "Unzip wisemappig.war ..."
mkdir $WISE_WEBAPP_DIR
unzip $BASE_DIR/../wise-webapp/target/wisemapping.war -d $WISE_WEBAPP_DIR >/dev/null
# DB Configuration ...
sed 's/\${database.base.url}\/db\/wisemapping/webapps\/wisemapping\/WEB-INF\/database\/wisemapping/' $WISE_WEBAPP_DIR/WEB-INF/app.properties > $WISE_WEBAPP_DIR/WEB-INF/app.properties2
mv $WISE_WEBAPP_DIR/WEB-INF/app.properties2 $WISE_WEBAPP_DIR/WEB-INF/app.properties
mkdir $WISE_WEBAPP_DIR/WEB-INF/database
cp -r $BASE_DIR/../wise-webapp/target/db/* $WISE_WEBAPP_DIR/WEB-INF/database/
cp $BASE_DIR/wisemapping.xml $JETTY_DIR/contexts/
# Distribute scripts
cp -r $BASE_DIR/../config/ $TARGET_DIR/wisemapping-$WISE_VERSION/config
cp ./start.sh ${JETTY_DIR}/
# Store version
echo $1 > $WISE_WEBAPP_DIR/version
git rev-parse HEAD >> $WISE_WEBAPP_DIR/version
# Zip all ...
cd $TARGET_DIR
zip -r wisemapping-$WISE_VERSION.zip wisemapping-$WISE_VERSION
cd ..

View File

@@ -0,0 +1,4 @@
ALTER TABLE USER
ADD COLUMN `google_sync` TINYINT(1) NULL,
ADD COLUMN `sync_code` VARCHAR(255) NULL,
ADD COLUMN `google_token` VARCHAR(255) NULL;

View File

@@ -0,0 +1,4 @@
ALTER TABLE "user"
ADD COLUMN `google_sync` BOOLEAN NULL,
ADD COLUMN `sync_code` VARCHAR(255) NULL,
ADD COLUMN `google_token` VARCHAR(255) NULL;

View File

@@ -1,4 +0,0 @@
#!/bin/sh
java -Xmx256m -Dorg.apache.jasper.compiler.disablejsr199=true -jar start.jar

View File

@@ -1,80 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
<!-- ==================================================================
Configure and deploy the wisemapping web application in $(jetty.home)/webapps/wisemapping
Note. If this file did not exist or used a context path other that /wisemapping
then the default configuration of jetty.xml would discover the wisemapping
webapplication with a WebAppDeployer. By specifying a context in this
directory, additional configuration may be specified and hot deployments
detected.
===================================================================== -->
<Configure class="org.eclipse.jetty.webapp.WebAppContext">
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- Required minimal context configuration : -->
<!-- + contextPath -->
<!-- + war OR resourceBase -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<Set name="contextPath">/wisemapping</Set>
<Set name="resourceBase"><SystemProperty name="jetty.home" default="."/>/webapps/wisemapping
</Set>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- Optional context configuration -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- <Set name="extractWAR">true</Set>
<Set name="copyWebDir">false</Set>
<Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
<Set name="overrideDescriptor"><SystemProperty name="jetty.home" default="."/>/contexts/wisemapping.d/override-web.xml</Set> -->
<!-- virtual hosts
<Set name="virtualHosts">
<Array type="String">
<Item>www.myVirtualDomain.com</Item>
<Item>localhost</Item>
<Item>127.0.0.1</Item>
</Array>
</Set>
-->
<!-- disable cookies
<Get name="sessionHandler">
<Get name="sessionManager">
<Set name="usingCookies" type="boolean">false</Set>
</Get>
</Get>
-->
<Get name="securityHandler">
<Set name="loginService">
<New class="org.eclipse.jetty.security.HashLoginService">
<Set name="name">Test Realm</Set>
<Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties
</Set>
<!-- To enable reload of realm when properties change, uncomment the following lines -->
<!-- changing refreshInterval (in seconds) as desired -->
<!--
<Set name="refreshInterval">5</Set>
<Call name="start"></Call>
-->
</New>
</Set>
<Set name="checkWelcomeFiles">true</Set>
</Get>
<!-- Non standard error page mapping -->
<!--
<Get name="errorHandler">
<Call name="addErrorPage">
<Arg type="int">500</Arg>
<Arg type="int">599</Arg>
<Arg type="String">/dump/errorCodeRangeMapping</Arg>
</Call>
</Get>
-->
</Configure>

22
docker-compose.yml Normal file
View File

@@ -0,0 +1,22 @@
version: '3'
services:
wise-api:
container_name: wise-api
hostname: wise-api
image: wise-api:latest
build:
context: ./wise-api
dockerfile: Dockerfile
ports:
- "8080:8080"
wise-ui:
container_name: wise-ui
image: wise-ui:latest
build:
context: ./wise-ui
dockerfile: Dockerfile
depends_on:
- wise-api
ports:
- "80:80"

View File

@@ -1,15 +0,0 @@
Copyright [2014] [wisemapping]
Licensed under WiseMapping Public License, Version 1.0 (the "License").
* It is basically the Apache License, Version 2.0 (the "License") plus the
"powered by wisemapping" text requirement on every single page;
you may not use this file except in compliance with the License.
You may obtain a copy of the license at
http://www.wisemapping.org/license
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

View File

@@ -1,255 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>mindplot</artifactId>
<packaging>jar</packaging>
<name>Mindmap Draw JavaScript Library</name>
<parent>
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<relativePath>../pom.xml</relativePath>
<version>3.1-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.wisemapping</groupId>
<artifactId>web2d</artifactId>
<version>${com.wisemapping.version}</version>
<scope>runtime</scope>
</dependency>
<!-- <dependency>
<groupId>com.google.jstestdriver</groupId>
<artifactId>maven-jstestdriver-plugin</artifactId>
<version>1.2.2-SNAPSHOT</version>
<scope>test</scope>
</dependency> -->
</dependencies>
<repositories>
<repository>
<id>jstd-maven-plugin google code repo</id>
<url>http://jstd-maven-plugin.googlecode.com/svn/maven2</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<source>
def outdir = new File(project.basedir, 'src/main/javascript');
if (project.packaging != 'pom')
{
def dir = new File(project.basedir, 'src/main/resources/');
dir.eachFile { file ->
def matcher = file.name =~ /messages_(.+)\.properties/;
def lang = matcher[0][1];
def outfile = new File(outdir, "MessageBundle_${lang}.js");
println "Converting ${file.name} to ${outfile.name}";
outfile.withWriter('UTF-8') { out ->
out.writeLine "mindplot.Messages.BUNDLES['${lang.toLowerCase()}'] = { ";
file.eachLine('UTF-8') { line ->
if( line.trim()!="" &amp;&amp; line[0]!='#' ) {
matcher = line =~ /(.+)=(.+)/;
out.writeLine("'${matcher[0][1]}' : \"${matcher[0][2]}\",");
}
}
out.writeLine("'DUMMY' : '' ");
out.writeLine "};"
}
}
}
</source>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>merge-js-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<copy toDir="${basedir}/target/classes/">
<fileset dir="${basedir}/src/main/javascript/">
<include name="libraries/**/*"/>
<include name="widget/colorPalette.*"/>
<include name="widget/*.css"/>
</fileset>
</copy>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>compress</goal>
</goals>
<configuration>
<sourceDirectory>${basedir}/src/main/javascript</sourceDirectory>
<outputDirectory>${basedir}/target/compress/</outputDirectory>
<nosuffix>true</nosuffix>
<excludes>
<exclude>libraries/**/*.js</exclude>
</excludes>
<aggregations>
<aggregation>
<output>${project.build.directory}/classes/mindplot-min.js</output>
<inputDir>${basedir}/target/compress</inputDir>
<includes>
<include>header.js</include>
<include>${basedir}/../web2d/target/classes/web2d.svg-min.js</include>
<include>Messages.js</include>
<include>TopicEventDispatcher.js</include>
<include>model/IMindmap.js</include>
<include>model/Mindmap.js</include>
<include>model/INodeModel.js</include>
<include>model/NodeModel.js</include>
<include>model/RelationshipModel.js</include>
<include>ActionDispatcher.js</include>
<include>StandaloneActionDispatcher.js</include>
<include>DesignerModel.js</include>
<include>Designer.js</include>
<include>ScreenManager.js</include>
<include>Workspace.js</include>
<include>ShrinkConnector.js</include>
<include>DesignerKeyboard.js</include>
<include>TopicStyle.js</include>
<include>NodeGraph.js</include>
<include>Topic.js</include>
<include>CentralTopic.js</include>
<include>MainTopic.js</include>
<include>DragTopic.js</include>
<include>DragManager.js</include>
<include>DragPivot.js</include>
<include>ConnectionLine.js</include>
<include>Relationship.js</include>
<include>DragConnector.js</include>
<include>TextEditor.js</include>
<include>MultilineTextEditor.js</include>
<include>TextEditorFactory.js</include>
<include>util/Shape.js</include>
<include>util/FadeEffect.js</include>
<include>persistence/ModelCodeName.js</include>
<include>persistence/XMLSerializer_Pela.js</include>
<include>persistence/XMLSerializer_Tango.js</include>
<include>persistence/Pela2TangoMigrator.js</include>
<include>persistence/XMLSerializer_Beta.js</include>
<include>persistence/Beta2PelaMigrator.js</include>
<include>persistence/XMLSerializerFactory.js</include>
<include>PersistenceManager.js</include>
<include>RestPersistenceManager.js</include>
<include>LocalStorageManager.js</include>
<include>EditorProperties.js</include>
<include>IconGroup.js</include>
<include>Icon.js</include>
<include>LinkIcon.js</include>
<include>NoteIcon.js</include>
<include>ActionIcon.js</include>
<include>ImageIcon.js</include>
<include>model/FeatureModel.js</include>
<include>model/IconModel.js</include>
<include>model/LinkModel.js</include>
<include>model/NoteModel.js</include>
<include>Command.js</include>
<include>DesignerActionRunner.js</include>
<include>DesignerUndoManager.js</include>
<include>ControlPoint.js</include>
<include>EditorOptions.js</include>
<include>RelationshipPivot.js</include>
<include>TopicFeature.js</include>
<include>commands/GenericFunctionCommand.js</include>
<include>commands/DeleteCommand.js</include>
<include>commands/DragTopicCommand.js</include>
<include>commands/AddTopicCommand.js</include>
<include>commands/ChangeFeatureToTopicCommand.js</include>
<include>commands/RemoveFeatureFromTopicCommand.js</include>
<include>commands/AddFeatureToTopicCommand.js</include>
<include>commands/AddRelationshipCommand.js</include>
<include>commands/MoveControlPointCommand.js</include>
<include>widget/ModalDialogNotifier.js</include>
<include>widget/ToolbarNotifier.js</include>
<include>widget/ToolbarItem.js</include>
<include>widget/ToolbarPaneItem.js</include>
<include>widget/NoteEditor.js</include>
<include>widget/LinkEditor.js</include>
<include>widget/FloatingTip.js</include>
<include>widget/LinkIconTooltip.js</include>
<include>widget/KeyboardShortcutTooltip.js</include>
<include>widget/ColorPalettePanel.js</include>
<include>widget/ListToolbarPanel.js</include>
<include>widget/FontFamilyPanel.js</include>
<include>widget/FontSizePanel.js</include>
<include>widget/TopicShapePanel.js</include>
<include>widget/IconPanel.js</include>
<include>widget/IMenu.js</include>
<include>widget/Menu.js</include>
<include>TopicFeature.js</include>
<include>layout/EventBusDispatcher.js</include>
<include>layout/ChangeEvent.js</include>
<include>layout/LayoutManager.js</include>
<include>layout/Node.js</include>
<include>layout/RootedTreeSet.js</include>
<include>layout/ChildrenSorterStrategy.js</include>
<include>layout/AbstractBasicSorter.js</include>
<include>layout/BalancedSorter.js</include>
<include>layout/SymmetricSorter.js</include>
<include>layout/GridSorter.js</include>
<include>layout/OriginalLayout.js</include>
<include>layout/EventBus.js</include>
<include>MessageBundle_en.js</include>
<include>MessageBundle_es.js</include>
<include>MessageBundle_de.js</include>
<include>MessageBundle_fr.js</include>
<include>MessageBundle_pt_BR.js</include>
<include>MessageBundle_zh_CN.js</include>
<include>MessageBundle_zh_TW.js</include>
<include>MessageBundle_ca.js</include>
<include>footer.js</include>
</includes>
</aggregation>
</aggregations>
<jswarn>false</jswarn>
<force>false</force>
<encoding>UTF-8</encoding>
<statistics>false</statistics>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</project>

View File

@@ -1 +0,0 @@
MessageBundle_*

View File

@@ -1,110 +0,0 @@
/*
* Copyright [2012] [wisemapping]
*
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
* It is basically the Apache License, Version 2.0 (the "License") plus the
* "powered by wisemapping" text requirement on every single page;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the license at
*
* http://www.wisemapping.org/license
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
//noinspection JSUnusedLocalSymbols
mindplot.ActionDispatcher = new Class({
Implements:[Events],
initialize: function(commandContext) {
$assert(commandContext, "commandContext can not be null");
},
addRelationship: function(model, mindmap) {
throw "method must be implemented.";
},
addTopics: function(models, parentTopicId) {
throw "method must be implemented.";
},
deleteEntities: function(topicsIds, relIds) {
throw "method must be implemented.";
},
dragTopic: function(topicId, position, order, parentTopic) {
throw "method must be implemented.";
},
moveTopic: function(topicId, position) {
throw "method must be implemented.";
},
moveControlPoint: function(ctrlPoint, point) {
throw "method must be implemented.";
},
changeFontFamilyToTopic: function(topicIds, fontFamily) {
throw "method must be implemented.";
},
changeFontStyleToTopic: function(topicsIds) {
throw "method must be implemented.";
},
changeFontColorToTopic: function(topicsIds, color) {
throw "method must be implemented.";
},
changeFontSizeToTopic : function(topicsIds, size) {
throw "method must be implemented.";
},
changeBackgroundColorToTopic: function(topicsIds, color) {
throw "method must be implemented.";
},
changeBorderColorToTopic: function(topicsIds, color) {
throw "method must be implemented.";
},
changeShapeTypeToTopic : function(topicsIds, shapeType) {
throw "method must be implemented.";
},
changeFontWeightToTopic : function(topicsIds) {
throw "method must be implemented.";
},
changeTextToTopic : function(topicsIds, text) {
throw "method must be implemented.";
},
shrinkBranch : function(topicsIds, collapse) {
throw "method must be implemented.";
},
addFeatureToTopic : function(topicId, type, attributes) {
throw "method must be implemented.";
},
changeFeatureToTopic : function(topicId, featureId, attributes) {
throw "method must be implemented.";
},
removeFeatureFromTopic : function(topicId, featureId) {
throw "method must be implemented.";
}
});
mindplot.ActionDispatcher.setInstance = function(dispatcher) {
mindplot.ActionDispatcher._instance = dispatcher;
};
mindplot.ActionDispatcher.getInstance = function() {
return mindplot.ActionDispatcher._instance;
};

View File

@@ -1,62 +0,0 @@
/*
* Copyright [2012] [wisemapping]
*
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
* It is basically the Apache License, Version 2.0 (the "License") plus the
* "powered by wisemapping" text requirement on every single page;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the license at
*
* http://www.wisemapping.org/license
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
mindplot.ActionIcon = new Class({
Extends:mindplot.Icon,
initialize: function(topic, url) {
this.parent(url);
this._node = topic;
},
getNode:function() {
return this._node;
},
setPosition:function(x, y) {
var size = this.getSize();
this.getImage().setPosition(x - size.width / 2, y - size.height / 2);
},
addEvent:function(event, fn) {
this.getImage().addEvent(event, fn);
},
addToGroup:function(group) {
group.appendChild(this.getImage());
},
setVisibility:function(visible) {
this.getImage().setVisibility(visible);
},
isVisible:function() {
return this.getImage().isVisible();
},
setCursor:function(cursor) {
return this.getImage().setCursor(cursor);
},
moveToBack:function(cursor) {
return this.getImage().moveToBack(cursor);
},
moveToFront:function(cursor) {
return this.getImage().moveToFront(cursor);
}
});

View File

@@ -1,66 +0,0 @@
/*
* Copyright [2012] [wisemapping]
*
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
* It is basically the Apache License, Version 2.0 (the "License") plus the
* "powered by wisemapping" text requirement on every single page;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the license at
*
* http://www.wisemapping.org/license
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
mindplot.CentralTopic = new Class({
Extends:mindplot.Topic,
initialize:function (model, options) {
this.parent(model, options);
},
_registerEvents:function () {
this.parent();
// This disable the drag of the central topic. But solves the problem of deselecting the nodes when the screen is clicked.
this.addEvent('mousedown', function (event) {
event.stopPropagation();
});
},
workoutIncomingConnectionPoint:function () {
return this.getPosition();
},
setCursor:function (type) {
type = (type == 'move') ? 'default' : type;
this.parent(type);
},
updateTopicShape:function () {
},
_updatePositionOnChangeSize:function () {
// Center main topic ...
var zeroPoint = new core.Point(0, 0);
this.setPosition(zeroPoint);
},
getShrinkConnector:function () {
return null;
},
workoutOutgoingConnectionPoint:function (targetPosition) {
$assert(targetPosition, 'targetPoint can not be null');
var pos = this.getPosition();
var isAtRight = mindplot.util.Shape.isAtRight(targetPosition, pos);
var size = this.getSize();
return mindplot.util.Shape.calculateRectConnectionPoint(pos, size, !isAtRight);
}
});

View File

@@ -1,51 +0,0 @@
/*
* Copyright [2012] [wisemapping]
*
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
* It is basically the Apache License, Version 2.0 (the "License") plus the
* "powered by wisemapping" text requirement on every single page;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the license at
*
* http://www.wisemapping.org/license
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
mindplot.Command = new Class(
{
initialize: function()
{
this._id = mindplot.Command._nextUUID();
},
execute: function(commandContext)
{
throw "execute must be implemented.";
},
undoExecute: function(commandContext)
{
throw "undo must be implemented.";
},
getId:function()
{
return this._id;
}
});
mindplot.Command._nextUUID = function()
{
if (!$defined(mindplot.Command._uuid))
{
mindplot.Command._uuid = 1;
}
mindplot.Command._uuid = mindplot.Command._uuid + 1;
return mindplot.Command._uuid;
};

View File

@@ -1,204 +0,0 @@
/*
* Copyright [2012] [wisemapping]
*
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
* It is basically the Apache License, Version 2.0 (the "License") plus the
* "powered by wisemapping" text requirement on every single page;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the license at
*
* http://www.wisemapping.org/license
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
mindplot.ConnectionLine = new Class({
initialize:function (sourceNode, targetNode, lineType) {
$assert(targetNode, 'parentNode node can not be null');
$assert(sourceNode, 'childNode node can not be null');
$assert(sourceNode != targetNode, 'Circular connection');
this._targetTopic = targetNode;
this._sourceTopic = sourceNode;
var line;
var ctrlPoints = this._getCtrlPoints(sourceNode, targetNode);
if (targetNode.getType() == mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
line = this._createLine(lineType, mindplot.ConnectionLine.CURVED);
line.setSrcControlPoint(ctrlPoints[0]);
line.setDestControlPoint(ctrlPoints[1]);
} else {
line = this._createLine(lineType, mindplot.ConnectionLine.SIMPLE_CURVED);
line.setSrcControlPoint(ctrlPoints[0]);
line.setDestControlPoint(ctrlPoints[1]);
}
// Set line styles ...
var strokeColor = mindplot.ConnectionLine.getStrokeColor();
line.setStroke(1, 'solid', strokeColor, 1);
line.setFill(strokeColor, 1);
this._line2d = line;
},
_getCtrlPoints:function (sourceNode, targetNode) {
var srcPos = sourceNode.workoutOutgoingConnectionPoint(targetNode.getPosition());
var destPos = targetNode.workoutIncomingConnectionPoint(sourceNode.getPosition());
var deltaX = (srcPos.x - destPos.x) / 3;
return [new core.Point(deltaX, 0), new core.Point(-deltaX, 0)];
},
_createLine:function (lineType, defaultStyle) {
if (!$defined(lineType)) {
lineType = defaultStyle;
}
lineType = parseInt(lineType);
this._lineType = lineType;
var line = null;
switch (lineType) {
case mindplot.ConnectionLine.POLYLINE:
line = new web2d.PolyLine();
break;
case mindplot.ConnectionLine.CURVED:
line = new web2d.CurvedLine();
break;
case mindplot.ConnectionLine.SIMPLE_CURVED:
line = new web2d.CurvedLine();
line.setStyle(web2d.CurvedLine.SIMPLE_LINE);
break;
default:
line = new web2d.Line();
break;
}
return line;
},
setVisibility:function (value) {
this._line2d.setVisibility(value);
},
isVisible:function () {
return this._line2d.isVisible();
},
setOpacity:function (opacity) {
this._line2d.setOpacity(opacity);
},
redraw:function () {
var line2d = this._line2d;
var sourceTopic = this._sourceTopic;
var sourcePosition = sourceTopic.getPosition();
var targetTopic = this._targetTopic;
var targetPosition = targetTopic.getPosition();
var sPos, tPos;
sPos = sourceTopic.workoutOutgoingConnectionPoint(targetPosition);
tPos = targetTopic.workoutIncomingConnectionPoint(sourcePosition);
line2d.setFrom(tPos.x, tPos.y);
line2d.setTo(sPos.x, sPos.y);
if (line2d.getType() == "CurvedLine") {
var ctrlPoints = this._getCtrlPoints(this._sourceTopic, this._targetTopic);
line2d.setSrcControlPoint(ctrlPoints[0]);
line2d.setDestControlPoint(ctrlPoints[1]);
}
// Add connector ...
this._positionateConnector(targetTopic);
},
_positionateConnector:function (targetTopic) {
var targetPosition = targetTopic.getPosition();
var offset = mindplot.Topic.CONNECTOR_WIDTH / 2;
var targetTopicSize = targetTopic.getSize();
var y, x;
if (targetTopic.getShapeType() == mindplot.model.TopicShape.LINE) {
y = targetTopicSize.height;
} else {
y = targetTopicSize.height / 2;
}
y = y - offset;
var connector = targetTopic.getShrinkConnector();
if ($defined(connector)) {
if (Math.sign(targetPosition.x) > 0) {
x = targetTopicSize.width;
connector.setPosition(x, y);
}
else {
x = -mindplot.Topic.CONNECTOR_WIDTH;
}
connector.setPosition(x, y);
}
},
setStroke:function (color, style, opacity) {
this._line2d.setStroke(null, null, color, opacity);
},
addToWorkspace:function (workspace) {
workspace.appendChild(this._line2d);
this._line2d.moveToBack();
},
removeFromWorkspace:function (workspace) {
workspace.removeChild(this._line2d);
},
getTargetTopic:function () {
return this._targetTopic;
},
getSourceTopic:function () {
return this._sourceTopic;
},
getLineType:function () {
return this._lineType;
},
getLine:function () {
return this._line2d;
},
getModel:function () {
return this._model;
},
setModel:function (model) {
this._model = model;
},
getType:function () {
return "ConnectionLine";
},
getId:function () {
return this._model.getId();
},
moveToBack:function () {
this._line2d.moveToBack();
},
moveToFront:function () {
this._line2d.moveToFront();
}
});
mindplot.ConnectionLine.getStrokeColor = function () {
return '#495879';
};
mindplot.ConnectionLine.SIMPLE = 0;
mindplot.ConnectionLine.POLYLINE = 1;
mindplot.ConnectionLine.CURVED = 2;
mindplot.ConnectionLine.SIMPLE_CURVED = 3;

View File

@@ -1,193 +0,0 @@
/*
* Copyright [2012] [wisemapping]
*
* Licensed under WiseMapping Public License, Version 1.0 (the "License").
* It is basically the Apache License, Version 2.0 (the "License") plus the
* "powered by wisemapping" text requirement on every single page;
* you may not use this file except in compliance with the License.
* You may obtain a copy of the license at
*
* http://www.wisemapping.org/license
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
mindplot.ControlPoint = new Class({
initialize:function() {
var control1 = new web2d.Elipse({width:6, height:6, stroke:'1 solid #6589de',fillColor:'gray', visibility:false});
control1.setCursor('pointer');
var control2 = new web2d.Elipse({width:6, height:6, stroke:'1 solid #6589de',fillColor:'gray', visibility:false});
control2.setCursor('pointer');
this._controlPointsController = [control1,control2];
this._controlLines = [new web2d.Line({strokeColor:"#6589de", strokeWidth:1, opacity:0.3}),
new web2d.Line({strokeColor:"#6589de", strokeWidth:1, opacity:0.3})];
this._isBinded = false;
this._controlPointsController[0].addEvent('mousedown', function(event) {
(this._mouseDown.bind(this))(event, mindplot.ControlPoint.FROM);
}.bind(this));
this._controlPointsController[0].addEvent('click', function(event) {
(this._mouseClick.bind(this))(event);
}.bind(this));
this._controlPointsController[0].addEvent('dblclick', function(event) {
(this._mouseClick.bind(this))(event);
}.bind(this));
this._controlPointsController[1].addEvent('mousedown', function(event) {
(this._mouseDown.bind(this))(event, mindplot.ControlPoint.TO);
}.bind(this));
this._controlPointsController[1].addEvent('click', function(event) {
(this._mouseClick.bind(this))(event);
}.bind(this));
this._controlPointsController[1].addEvent('dblclick', function(event) {
(this._mouseClick.bind(this))(event);
}.bind(this));
},
setSide : function(side) {
this._side = side;
},
setLine : function(line) {
if ($defined(this._line)) {
this._removeLine();
}
this._line = line;
this._createControlPoint();
this._endPoint = [];
this._orignalCtrlPoint = [];
this._orignalCtrlPoint[0] = this._controls[0].clone();
this._orignalCtrlPoint[1] = this._controls[1].clone();
this._endPoint[0] = this._line.getLine().getFrom().clone();
this._endPoint[1] = this._line.getLine().getTo().clone();
},
redraw : function() {