Commit Graph

884 Commits

Author SHA1 Message Date
Paulo Gustavo Veiga
37e9676687 Merge branch 'develop' into feature/WISE-15-mindmapListFolderSupport 2014-02-01 19:18:57 -03:00
Paulo Gustavo Veiga
6ed7bc9154 Update jquery version. 2014-02-01 19:15:19 -03:00
Paulo Gustavo Veiga
d535fcc381 Update jquery version. 2014-02-01 19:15:19 -03:00
Ezequiel Bergamaschi
d28b439e62 remove stopPropagation 2014-02-01 18:54:49 -03:00
Ezequiel Bergamaschi
0738804d88 fix mindmapList filter problem on long labels names 2014-02-01 18:54:37 -03:00
Ezequiel Bergamaschi
0891beeecd fix one click problem on empty input 2014-02-01 18:13:16 -03:00
Ezequiel Bergamaschi
4646ae15c4 adding missing css 2014-02-01 16:25:09 -03:00
Ezequiel Bergamaschi
54fb696090 hack removed 2014-02-01 16:24:57 -03:00
Ezequiel Bergamaschi
e5d9380699 change linkToMindmaps logic 2014-02-01 16:24:48 -03:00
Ezequiel Bergamaschi
5fe892abfd adding private methods 2014-02-01 16:23:30 -03:00
Ezequiel Bergamaschi
12ec295fe0 rename method 2014-02-01 16:22:54 -03:00
Ezequiel Bergamaschi
8936ef5008 btn actions 2014-02-01 15:46:18 -03:00
Ezequiel Bergamaschi
0eaa8c8638 more readable function 2014-02-01 15:46:18 -03:00
Ezequiel Bergamaschi
28010a85aa add label btn with dropdown 2014-02-01 15:46:18 -03:00
Ezequiel Bergamaschi
f1e4b1c8c0 remove add label dialog and btn 2014-02-01 15:46:18 -03:00
Ezequiel Bergamaschi
1a2ba04b76 fix filter by none 2014-02-01 15:46:18 -03:00
Claudio Barril
1ead555e09 fixing tag cascade delete when mindmap tagged is deleted 2014-02-01 04:19:39 -03:00
Claudio Barril
cf246f00c8 fix duplicate tags for a map in ui 2014-02-01 04:10:00 -03:00
Ezequiel Bergamaschi
4200d85cc0 adding delete action 2014-02-01 01:42:54 -03:00
Ezequiel Bergamaschi
a4ae253ae3 adding delete X button 2014-02-01 01:42:36 -03:00
Ezequiel Bergamaschi
640b8d7ed0 delete modal dialog 2014-02-01 01:41:02 -03:00
Ezequiel Bergamaschi
5429178a1c make static public attributes final 2014-02-01 01:38:40 -03:00
Ezequiel Bergamaschi
b79930394d remove label api 2014-01-30 04:35:48 -03:00
Ezequiel Bergamaschi
c8e0b92ef5 column name changes 2014-01-30 04:35:06 -03:00
Ezequiel Bergamaschi
7d0e4dc35a replace deprecated live method 2014-01-30 04:34:25 -03:00
Ezequiel Bergamaschi
5f9b98324d css changes 2014-01-30 04:34:08 -03:00
Ezequiel Bergamaschi
95fcbb5888 removing empty lines 2014-01-30 01:54:48 -03:00
Ezequiel Bergamaschi
2f4efde017 add tag on add label to mindmap action 2014-01-30 01:54:36 -03:00
Paulo Gustavo Veiga
71bba1c5ab Merge branch 'develop' into feature/WISE-16-remove_user 2014-01-30 00:24:06 -03:00
Paulo Gustavo Veiga
708b8eb355 Merge branch 'develop' into feature/WISE-16-remove_user 2014-01-30 00:24:06 -03:00
Claudio Barril
301048ecad callback functions and type added to postChange function 2014-01-29 22:17:25 -03:00
Claudio Barril
26138188ea callback functions and type added to postChange function 2014-01-29 22:17:25 -03:00
Ezequiel Bergamaschi
148b56aecb refactor MindmapFilter to accept Label Filters 2014-01-29 03:59:42 -03:00
Ezequiel Bergamaschi
684c412e95 hasLabel method for mindmap 2014-01-29 03:59:05 -03:00
Ezequiel Bergamaschi
7d9ccaec91 Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport 2014-01-29 02:58:10 -03:00
Ezequiel Bergamaschi
b4c69133f5 api rest 2014-01-29 02:56:09 -03:00
Ezequiel Bergamaschi
9edea47dbd add label to mindmap ui logic 2014-01-29 02:55:44 -03:00
Ezequiel Bergamaschi
ed55fd824f insert tag on table load 2014-01-29 02:55:00 -03:00
Ezequiel Bergamaschi
eff063ca37 remove default option 2014-01-29 02:54:33 -03:00
Ezequiel Bergamaschi
a74f4158c6 css changes 2014-01-29 02:52:37 -03:00
Ezequiel Bergamaschi
d601a2818f remove unused method 2014-01-29 02:52:25 -03:00
Ezequiel Bergamaschi
81e9b5f59d add label modal dialog 2014-01-28 02:59:09 -03:00
Ezequiel Bergamaschi
f048d0adb7 fetchLabels with postUpdate callback 2014-01-28 02:58:39 -03:00
Ezequiel Bergamaschi
2ec941e1a0 link label to mindmaps 2014-01-28 02:57:40 -03:00
Ezequiel Bergamaschi
72a46367d6 label validator finished 2014-01-28 02:21:14 -03:00
Ezequiel Bergamaschi
b19ac2c4c3 label with colors in filter 2014-01-28 01:44:56 -03:00
Ezequiel Bergamaschi
acb3782561 js refactor 2014-01-28 01:44:56 -03:00
Ezequiel Bergamaschi
c7b193f43f remove duplicate labels on fetch 2014-01-28 01:44:55 -03:00
Ezequiel Bergamaschi
154db9d9e8 adding color properties to label 2014-01-28 00:13:29 -03:00
Ezequiel Bergamaschi
deb6c4be4d bootstrap color picker plugin 2014-01-27 23:48:11 -03:00
Paulo Gustavo Veiga
8b6ef7536e Bug WISE-205 fixed.
Fix IE 11 browser detection.
2014-01-26 22:09:00 -03:00
Paulo Gustavo Veiga
d0e07269c4 Bug WISE-205 fixed.
Fix IE 11 browser detection.
2014-01-26 22:09:00 -03:00
Paulo Gustavo Veiga
81e3cb590c Add Jira Issue Integration. 2014-01-26 20:12:56 -03:00
Paulo Gustavo Veiga
a70dd1e52e Add Jira Issue Integration. 2014-01-26 20:12:56 -03:00
Ezequiel Bergamaschi
194a7f200e retrieve label list on mindmapList 2014-01-26 18:21:55 -03:00
Ezequiel Bergamaschi
306a2a2ada retrieveList api for labels 2014-01-26 18:21:14 -03:00
Ezequiel Bergamaschi
0c43bb4ad3 adding final statements 2014-01-26 18:18:49 -03:00
Ezequiel Bergamaschi
49d9820a44 create tag item on left list 2014-01-25 23:25:17 -03:00
Ezequiel Bergamaschi
3f2c687643 bug WISE-199 fixed 2014-01-25 23:24:04 -03:00
Ezequiel Bergamaschi
c68b4c90da removing unnecesary validation 2014-01-25 23:21:44 -03:00
Ezequiel Bergamaschi
1b480b566a rest api for label and hibernate mapping 2014-01-25 23:21:17 -03:00
Ezequiel Bergamaschi
02cb53d082 fixing merge conflicts 2014-01-25 19:54:28 -03:00
Claudio Barril
0acd0c097f fix typo 2014-01-25 19:50:46 -03:00
Claudio Barril
9a9dabc0ab fix typo 2014-01-25 19:50:46 -03:00
Paulo Gustavo Veiga
07b18d9527 Improve delete message.
Add unit test.
2014-01-25 12:31:14 -03:00
Paulo Gustavo Veiga
adfc6c08f2 Improve delete message.
Add unit test.
2014-01-25 12:31:14 -03:00
Paulo Gustavo Veiga
9a1c0fe46d Merge branch 'develop' into feature/WISE-16-remove_user
Conflicts:
	wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
	wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
2014-01-25 11:33:31 -03:00
Paulo Gustavo Veiga
a8f7d28c11 Merge branch 'develop' into feature/WISE-16-remove_user
Conflicts:
	wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
	wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
2014-01-25 11:33:31 -03:00
Paulo Gustavo Veiga
0493d66daa Fix mindmaping controller tests. 2014-01-25 04:21:59 -03:00
Paulo Gustavo Veiga
f66c476187 Fix mindmaping controller tests. 2014-01-25 04:21:59 -03:00
Paulo Gustavo Veiga
9b3f1c79a6 Enable MindmapController rests. 2014-01-25 03:13:51 -03:00
Paulo Gustavo Veiga
5e62eb3279 Enable MindmapController rests. 2014-01-25 03:13:51 -03:00
Paulo Gustavo Veiga
2ccb4bfb83 Remove HTML support for test ... 2014-01-24 22:58:25 -03:00
Paulo Gustavo Veiga
686e011f9b Remove HTML support for test ... 2014-01-24 22:58:25 -03:00
Paulo Gustavo Veiga
f610bfdfb3 Fix W3ORG logo url location on footer. 2014-01-24 22:42:05 -03:00
Paulo Gustavo Veiga
f0c6d944a8 Fix W3ORG logo url location on footer. 2014-01-24 22:42:05 -03:00
Paulo Gustavo Veiga
25e6e4de4f Bug WISE-190 fixed.
Implement REST Console support.
2014-01-24 09:45:22 -03:00
Paulo Gustavo Veiga
ae604b1c70 Bug WISE-190 fixed.
Implement REST Console support.
2014-01-24 09:45:22 -03:00
Ezequiel Bergamaschi
0d11dee06c format 2014-01-24 02:47:51 -03:00
ezequiel
88fed0af0a api rest call 2014-01-24 00:21:43 -03:00
ezequiel
31aab0bd48 api rest call 2014-01-24 00:21:43 -03:00
ezequiel
4f40431d55 adding warning msg on delete user popup 2014-01-24 00:21:27 -03:00
ezequiel
d1004f2919 adding warning msg on delete user popup 2014-01-24 00:21:27 -03:00
Ezequiel Bergamaschi
f4fb008f1b popup for label 2014-01-21 01:45:12 -03:00
Claudio Barril
da2594292b delete account lash in account settings 2014-01-20 23:10:57 -03:00
Claudio Barril
f30106ab39 delete account lash in account settings 2014-01-20 23:10:57 -03:00
Claudio Barril
8a684519f0 DELETE__ACCOUNT message property (en and es languages) 2014-01-20 23:10:15 -03:00
Claudio Barril
24417d4fd0 DELETE__ACCOUNT message property (en and es languages) 2014-01-20 23:10:15 -03:00
Ezequiel Bergamaschi
8bdc5f6b05 new button is now a dropdown in order to support folders 2014-01-20 01:03:32 -03:00
Ezequiel Bergamaschi
91b5a08b11 adding new properties 2014-01-20 01:02:48 -03:00
Ezequiel Bergamaschi
871d89a304 blue icon on mindmap list 2014-01-19 22:39:44 -03:00
Ezequiel Bergamaschi
e34f5ce45a adding icon to map name in mindmapList 2014-01-19 21:25:53 -03:00
Paulo Gustavo Veiga
3d948a1419 Merge branch 'develop' into feature/WISE-16-remove_user 2014-01-12 23:42:47 -03:00
Paulo Gustavo Veiga
cd02cdb1ce Merge branch 'develop' into feature/WISE-16-remove_user 2014-01-12 23:42:47 -03:00
Paulo Gustavo Veiga
703414266e Fix failing uning tests ... 2014-01-12 22:53:42 -03:00
Paulo Gustavo Veiga
22c102917e Fix failing uning tests ... 2014-01-12 22:53:42 -03:00
Paulo Gustavo Veiga
50adfa0053 Revert "Bug WISE-16 fixed. Backed completed."
This reverts commit 9a77ff3bb8.
2014-01-10 00:21:21 -03:00
Paulo Gustavo Veiga
a2db34ae61 Revert "Bug WISE-16 fixed. Backed completed."
This reverts commit 9a77ff3bb8.
2014-01-10 00:21:21 -03:00
Paulo Gustavo Veiga
5f29024559 Bug WISE-16 fixed. Backed completed. 2014-01-10 00:19:56 -03:00
Paulo Gustavo Veiga
9a77ff3bb8 Bug WISE-16 fixed. Backed completed. 2014-01-10 00:19:56 -03:00
Paulo Gustavo Veiga
94ac039390 Bug WISE-16 fixed. Backed completed. 2014-01-10 00:18:00 -03:00
Paulo Gustavo Veiga
805f5eed7f Bug WISE-16 fixed. Backed completed. 2014-01-10 00:18:00 -03:00
Paulo Gustavo Veiga
26bd9f8840 Resources moved to https. 2014-01-02 18:34:14 -03:00
Paulo Gustavo Veiga
da8f474c64 Add extra documentation for LDAP configuration 2013-09-25 11:00:54 -03:00
Paulo Gustavo Veiga
35d76ea56f Fix message. 2013-04-20 00:43:19 -03:00
Paulo Gustavo Veiga
a230dd104c Fix unlock issues. 2013-04-07 12:27:45 -03:00
Paulo Gustavo Veiga
31fb342ef1 Fix missing message. 2013-04-05 20:49:17 -03:00
Paulo Gustavo Veiga
65283a0edc Improve text export. 2013-04-04 22:11:59 -03:00
Paulo Gustavo Veiga
96cb014a6e Add firefox 20 support. 2013-04-04 20:39:11 -03:00
Paulo Gustavo Veiga
8915e7eddf Fix rename issues. 2013-03-31 15:33:00 -03:00
Paulo Gustavo Veiga
fd021de86d Mindmap loading is lazy. 2013-03-30 01:09:28 -03:00
Paulo Gustavo Veiga
f5b4cc9ea7 Add debung info for exceptions.... 2013-03-29 22:44:13 -03:00
Paulo Gustavo Veiga
8e66c97aa3 Handle deleted maps propertly. 2013-03-29 21:09:28 -03:00
Paulo Gustavo Veiga
bd80d95d22 Fix NPE on loading maps. 2013-03-29 20:32:52 -03:00
Paulo Gustavo Veiga
4d46864388 Add compress fix. 2013-03-29 15:44:49 -03:00
Paulo Gustavo Veiga
3696e126e3 Fix descriptor. 2013-03-29 15:09:55 -03:00
Paulo Gustavo Veiga
65ee33a09f Fix compile 2013-03-29 14:57:21 -03:00
Paulo Gustavo Veiga
dce29eda19 Fix history bug. 2013-03-29 14:51:21 -03:00
Paulo Gustavo Veiga
81d3d591fa Keep working on mindmanager support. 2013-03-29 14:29:58 -03:00
Paulo Gustavo Veiga
2a2dc7c57f Change mindjet extension. 2013-03-29 12:08:40 -03:00
Paulo Gustavo Veiga
2c355205d0 Complete mindjet integration. 2013-03-29 11:49:59 -03:00
Paulo Gustavo Veiga
ed508d646c Add mindjet support. 2013-03-29 11:28:26 -03:00
Paulo Gustavo Veiga
fd00a5e0fc Minor text fix. 2013-03-28 17:20:01 -03:00
Paulo Gustavo Veiga
06210ab95b Add text/plan, open office and xls transformation support. 2013-03-28 17:01:42 -03:00
Paulo Gustavo Veiga
3137f78cce Improve purge. 2013-03-28 12:28:53 -03:00
Paulo Gustavo Veiga
dcd59efc12 Add history purge. 2013-03-26 22:58:45 -03:00
Paulo Gustavo Veiga
2b8972a35a Add delete permission to admin. 2013-03-24 22:57:32 -03:00
Paulo Gustavo Veiga
f961ae578c Add purge to history... 2013-03-24 22:49:55 -03:00
Paulo Gustavo Veiga
0188e15a92 Add more catchs .. 2013-03-24 19:28:20 -03:00
Paulo Gustavo Veiga
c12b73c1ff Add catch ... 2013-03-24 19:24:24 -03:00
Paulo Gustavo Veiga
a60f001f2c Check for more period. 2013-03-24 19:15:37 -03:00
Paulo Gustavo Veiga
04d58533cf Catch all exceptions during purge. 2013-03-24 17:20:41 -03:00
Paulo Gustavo Veiga
ed6d89fb7e Admin can delete maps. 2013-03-24 16:58:18 -03:00
Paulo Gustavo Veiga
3b47ed2e52 Fix string case. 2013-03-24 16:48:14 -03:00
Paulo Gustavo Veiga
abfc06c7d5 Fix classcast. 2013-03-24 16:41:57 -03:00
Paulo Gustavo Veiga
712cc2c60b Fix classcast. 2013-03-24 16:33:58 -03:00
Paulo Gustavo Veiga
057d5bc01f Add admin as permissions for finding. 2013-03-24 16:30:38 -03:00
Paulo Gustavo Veiga
e36b0b8b52 Handle exceptions. 2013-03-24 16:20:56 -03:00
Paulo Gustavo Veiga
4dd7a82e32 Add debug info. 2013-03-24 16:10:30 -03:00
Paulo Gustavo Veiga
580d977aa9 Add purge flag. 2013-03-24 15:57:59 -03:00
Paulo Gustavo Veiga
45c67d6b57 Add purge flag. 2013-03-24 15:42:25 -03:00
Paulo Gustavo Veiga
0b6c8a5977 Add purge action. 2013-03-24 15:11:06 -03:00
Paulo Gustavo Veiga
811cc8a668 Add purge action. 2013-03-24 15:03:19 -03:00
Paulo Gustavo Veiga
f136240591 Minor fix on property. 2013-03-19 23:25:36 -03:00
Paulo Gustavo Veiga
e0a6d15ad0 Initialize OPSS values. 2013-03-19 23:18:19 -03:00
Paulo Gustavo Veiga
617abd9d90 Change exception ... 2013-03-19 22:41:43 -03:00
Paulo Gustavo Veiga
c2e74cb2d4 Fix HTML tests positioning. 2013-03-19 22:21:51 -03:00
Paulo Gustavo Veiga
db70db49a5 Add missing resource. 2013-03-19 21:44:51 -03:00
Paulo Gustavo Veiga
4cc6382043 Fix resources. 2013-03-19 21:39:17 -03:00
Paulo Gustavo Veiga
c8d3d99224 Do not send duplicated emails on bugs. 2013-03-19 21:18:15 -03:00