vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 14:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,524 Commits 10 Branches 29 Tags 26 MiB
d48abe6121
Commit Graph

878 Commits

Author SHA1 Message Date
Ezequiel Bergamaschi
829815f9e9 Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport 2014-01-26 12:18:37 -03:00
Claudio Barril
6ac7948312 Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user 2014-01-25 23:53:54 -03:00
Claudio Barril
b9e64e20e3 fix mysql populate file selected 2014-01-25 23:53:17 -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
Claudio Barril
cedd12314b Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user 2014-01-25 23:03:21 -03:00
Ezequiel Bergamaschi
02cb53d082 fixing merge conflicts 2014-01-25 19:54:28 -03:00
Claudio Barril
9a9dabc0ab fix typo 2014-01-25 19:50:46 -03:00
Paulo Gustavo Veiga
ed4d50724a Add JCoco Coverage report. 2014-01-25 18:31:50 -03:00
Ezequiel Bergamaschi
94812cd96a adding missing db profiles due to a wrong merge 2014-01-25 18:16:21 -03:00
Paulo Gustavo Veiga
5d4da27842 Fix Jetty hangs during install. 2014-01-25 15:27:03 -03:00
Paulo Gustavo Veiga
adfc6c08f2 Improve delete message. 
Add unit test.
 2014-01-25 12:31:14 -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
5b1fb27ca2 Add Maven Tomcat Plugin. 2014-01-25 04:53:51 -03:00
Paulo Gustavo Veiga
0493d66daa 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
2ccb4bfb83 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
ebf4603889 Conflicts: 
README.md
	config/database/mysql/apopulate-schemas.sql
	wise-webapp/pom.xml
 2014-01-24 20:17:21 -03:00
Paulo Gustavo Veiga
25e6e4de4f 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 Bergamaschi
00773ae3b9 adding missing version to tomcat plugin 2014-01-24 02:47:01 -03:00
ezequiel
31aab0bd48 api rest call 2014-01-24 00:21:43 -03:00
ezequiel
d1004f2919 adding warning msg on delete user popup 2014-01-24 00:21:27 -03:00
Ezequiel Bergamaschi
091955255b Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport 2014-01-21 01:47:39 -03:00
Ezequiel Bergamaschi
f4fb008f1b popup for label 2014-01-21 01:45:12 -03:00
Claudio Barril
f30106ab39 delete account lash in account settings 2014-01-20 23:10:57 -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
Claudio Barril
0968549e55 creating mysql and hsql maven profiles 2014-01-19 22:38:46 -03:00
Ezequiel Bergamaschi
e34f5ce45a adding icon to map name in mindmapList 2014-01-19 21:25:53 -03:00
Ezequiel Bergamaschi
b401a53a21 addding tomcat plugin 2014-01-19 18:26:48 -03:00
Claudio Barril
4eec745296 Merge remote-tracking branch 'origin/feature-WISE-78-pom-improvements' into feature/WISE-16-remove_user 2014-01-19 18:25:03 -03:00
Claudio Barril
cc9fa543cb creating mysql and hsql maven profiles 2014-01-19 14:33:56 -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
50adfa0053 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
805f5eed7f Bug WISE-16 fixed. Backed completed. 2014-01-10 00:18:00 -03:00
Ezequiel Bergamaschi
1dce163782 fix wrong version of jetty-maven-plugin 2014-01-07 16:58:05 -03:00
Paulo Gustavo Veiga
f75124233b Update part of Maven Pluggins versions. 2014-01-05 18:10:42 -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
9686431874 Fix node export format. 2013-04-04 21:46:54 -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
Paulo Gustavo Veiga
645402e691 Fix property name. 2013-03-18 23:27:05 -03:00
Paulo Gustavo Veiga
8ed1a18280 Minor fixes. 2013-03-18 23:25:49 -03:00
Paulo Gustavo Veiga
0d81db52f1 Add alter table scripts. 2013-03-17 23:40:39 -03:00
Paulo Gustavo Veiga
9b21c77485 Finish OpenId implementation. 2013-03-17 23:17:55 -03:00
Paulo Gustavo Veiga
94356a5773 Outh working!. Pending: 
- Test all databases
- Migration Scripts
- Manage error due to changing of authentication schemas.
- Link from the login page.
- What happend with the logout ?.
 2013-03-17 18:51:33 -03:00
Paulo Gustavo Veiga
2f8df725c9 Login page completed. 2013-03-17 16:39:50 -03:00
Paulo Gustavo Veiga
48e211cc2d Escape invalid XML chars during serialization. 2013-03-17 11:22:53 -03:00
Paulo Gustavo Veiga
3578d6e624 Temporal hack for broken maps in Firefox. \r issue. 2013-03-14 21:38:38 -03:00
Pablo Luna
9e67329703 fixing build 2013-03-14 21:51:17 +00:00
Paulo Gustavo Veiga
8489eaea6d More tests fixed. 2013-03-10 21:25:21 -03:00
Paulo Gustavo Veiga
9fb0ebd8f6 Fix tests. 2013-03-10 21:20:19 -03:00
Paulo Gustavo Veiga
e03f5f632b Fix export unit tests. 2013-03-10 19:57:24 -03:00
Paulo Gustavo Veiga
b6ee7e61b8 Fix SVG export tests... 2013-03-10 19:45:21 -03:00
Paulo Gustavo Veiga
202c3f28a3 Fix open id. 2013-03-10 19:07:52 -03:00
Paulo Gustavo Veiga
a1a28efe49 Minor fix, use db database result. 2013-03-10 19:06:55 -03:00
Paulo Gustavo Veiga
0e5592a0d3 Move database configuration scripts. 2013-03-10 19:05:33 -03:00
Paulo Gustavo Veiga
52efdf729b Try to fix encoding issue on post. 2013-03-07 23:46:07 -03:00
Paulo Gustavo Veiga
bf3bd5c1c7 Fix save on Opera. 2013-03-02 21:29:26 -03:00
Paulo Gustavo Veiga
9cabfb14a5 Add more debug info. 2013-03-02 18:13:59 -03:00
Paulo Gustavo Veiga
b5a7a11920 Check map before save. 2013-02-27 23:08:37 -03:00
Paulo Gustavo Veiga
846ad24bf3 Minor fix to enable LDAP customization of first and last name. 2013-02-24 17:46:05 -03:00
Paulo Gustavo Veiga
9ab0637690 Fix scape name with spaces. 2013-02-24 17:34:25 -03:00
Paulo Gustavo Veiga
312f5447b8 Fix NPE. 2013-02-23 15:39:10 -03:00
Paulo Gustavo Veiga
879fa4c926 Add postgres scripts. 2013-02-23 15:33:09 -03:00
Paulo Gustavo Veiga
5e0c879654 Minor fix on export. 2013-02-23 14:54:51 -03:00
Paulo Gustavo Veiga
9049ca25aa More export issues fixed. 2013-02-23 13:53:56 -03:00
Paulo Gustavo Veiga
76ccc5e6b2 Fix mindmap export. 2013-02-23 13:48:43 -03:00
Paulo Gustavo Veiga
8aa733158c Minor translation fix. 2013-02-23 12:58:34 -03:00
Paulo Gustavo Veiga
0eef3b3251 Add Catalan support for time ... 2013-02-23 12:53:06 -03:00
Paulo Gustavo Veiga
965ba4edaa Space " in customization dialogs. 2013-02-23 12:44:45 -03:00
Paulo Gustavo Veiga
7960c0a419 Finsh CA Integrationb. 2013-02-22 20:49:20 -03:00
Paulo Gustavo Veiga
99a3fa64ec Add Catalan support. 2013-02-22 20:39:51 -03:00
Paulo Gustavo Veiga
a7316d516c Add rest service doc. 2013-02-22 20:08:48 -03:00
Paulo Gustavo Veiga
d2b7b640d9 Fix print issue loading cached maps. 2013-02-20 14:16:00 -03:00
Paulo Gustavo Veiga
79f5e51513 Finish LDAP support. 2013-02-20 13:15:31 -03:00
Paulo Gustavo Veiga
0f605d89f0 Enable security configuration from properties. 2013-02-17 23:10:04 -03:00
Paulo Gustavo Veiga
cb6828c08e Minor fixes 
Update Spring 3.1.3 fixed.
 2013-02-17 21:26:42 -03:00
Paulo Gustavo Veiga
3ff67910c9 Add LDAP support. 2013-02-17 21:00:08 -03:00
Paulo Gustavo Veiga
51f531f6b4 Fix revert on zip format. 2013-02-13 23:13:27 -03:00
Paulo Gustavo Veiga
fc22dd32a2 Compiles. 2013-02-13 23:08:55 -03:00
Paulo Gustavo Veiga
deca7e51b2 Fix npe. 2013-02-13 23:06:18 -03:00
Paulo Gustavo Veiga
28ffead0a0 Fix npe. 2013-02-13 22:51:55 -03:00
Paulo Gustavo Veiga
d1dfb48be5 Add new files. 2013-02-13 22:46:45 -03:00
Paulo Gustavo Veiga
9360a27f15 Show more rows on history. 2013-02-13 21:41:47 -03:00
Paulo Gustavo Veiga
cc8ff94b10 Fix encoding issue on import. 2013-02-11 13:25:07 -03:00
Paulo Gustavo Veiga
f245116e48 Fix deleted object would be re-saved by cascade (remove deleted object from associations): [com.wisemapping.model.Collaboration#114902]; nested exception is org.hibernate.ObjectDeletedException: deleted object would be re-saved by cascade (remove deleted object from associations): [com.wisemapping.model.Collaboration#114902] 2013-02-10 16:14:32 -03:00
Paulo Gustavo Veiga
7bd87c50ac - Disable cache ... 2013-02-10 15:24:37 -03:00
Paulo Gustavo Veiga
86d5c98ed7 - Fix security issues when the map is loaded from the rest service. Two URL has been defined for each type of access. 2013-02-07 21:56:36 -03:00
Paulo Gustavo Veiga
5d05f21803 - Fix security issues when the map is loaded from the rest service. Two URL has been defined for each type of access. 2013-02-07 21:44:20 -03:00
Paulo Gustavo Veiga
6e2880c8cc - Review security for print. This is required for enable public sharing of maps. The issue is when the map is not public in the editor. 2013-02-03 17:47:48 -03:00
Paulo Gustavo Veiga
87ce3fc0a9 - Print is not public 
- Public maps now are shared using REST
 2013-02-03 17:33:19 -03:00
Paulo Gustavo Veiga
92849b02eb Finish moving mindmap loading to rest. 2013-02-03 13:47:31 -03:00
Paulo Gustavo Veiga
829655f253 Add dummy parameter when the service is readOnly. 2013-02-03 13:19:24 -03:00
Paulo Gustavo Veiga
b4bdad796e Use the same PersitenceManager for public maps. 2013-02-03 12:54:46 -03:00
Paulo Gustavo Veiga
d52e2c04a6 Fix encoding on returning maps. 2013-02-03 12:51:12 -03:00
Paulo Gustavo Veiga
edc3351fd8 Fix httpBase servlet request property. 2013-02-03 12:38:04 -03:00