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

395 Commits

Author SHA1 Message Date
Ezequiel Bergamaschi
16985ae7d7 rows clickeables 2014-03-10 00:12:49 -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
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
ad7bde02e3 Move adsense location 2014-02-12 01:00:12 -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
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
788cb1ea98 fixing ui 2014-02-11 00:18:46 -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
06d3f0cd25 Fix publish page. 2014-02-09 04:54:36 -03:00
Paulo Gustavo Veiga
2a37167b01 Fix import dialog... 2014-02-09 04:34:25 -03:00
Paulo Gustavo Veiga
2b89fdccca Fix registration, login 2014-02-09 04:19:39 -03:00
Paulo Gustavo Veiga
6624abb9ed Fix login. 2014-02-09 04:03:43 -03:00
Paulo Gustavo Veiga
726ffcd817 First corrections. 
Fix more styling issues.

Conflicts:
	wise-webapp/src/main/webapp/jsp/accountSettings.jsp
 2014-02-09 03:26:51 -03:00
Claudio Barril
7525ba4820 Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user 2014-02-04 22:18:29 -03:00
Paulo Gustavo Veiga
6ed7bc9154 Update jquery version. 2014-02-01 19:15:19 -03:00
Paulo Gustavo Veiga
71bba1c5ab 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
Paulo Gustavo Veiga
81e3cb590c Add Jira Issue Integration. 2014-01-26 20:12:56 -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
f0c6d944a8 Fix W3ORG logo url location on footer. 2014-01-24 22:42:05 -03:00
ezequiel
88fed0af0a 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
Claudio Barril
da2594292b delete account lash in account settings 2014-01-20 23:10:57 -03:00
Paulo Gustavo Veiga
94ac039390 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
2c355205d0 Complete mindjet integration. 2013-03-29 11:49:59 -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
c2e74cb2d4 Fix HTML tests positioning. 2013-03-19 22:21:51 -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
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
202c3f28a3 Fix open id. 2013-03-10 19:07:52 -03:00
Paulo Gustavo Veiga
52efdf729b Try to fix encoding issue on post. 2013-03-07 23:46:07 -03:00
Paulo Gustavo Veiga
965ba4edaa Space " in customization dialogs. 2013-02-23 12:44:45 -03:00
Paulo Gustavo Veiga
99a3fa64ec Add Catalan support. 2013-02-22 20:39:51 -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
deca7e51b2 Fix npe. 2013-02-13 23:06:18 -03:00
Paulo Gustavo Veiga
d1dfb48be5 Add new files. 2013-02-13 22:46:45 -03:00
Paulo Gustavo Veiga
cc8ff94b10 Fix encoding issue on import. 2013-02-11 13:25:07 -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
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
73a664ab97 Minor fix. 2013-01-31 22:57:49 -03:00
Paulo Gustavo Veiga
cabca992d1 Map are loaded using Rest service. 2013-01-31 22:50:21 -03:00
Paulo Gustavo Veiga
0d8b6b210e - Add metadata descriptor to template page 
- Add png export tests.
 2012-12-01 19:09:31 -03:00
Paulo Gustavo Veiga
f4f97d3112 Add disclamer for tutotial video reproduction. 2012-11-30 22:25:45 -03:00
Paulo Gustavo Veiga
6fe53446ce Add link to tutorial video. 2012-11-30 22:03:11 -03:00
Paulo Gustavo Veiga
9f495f1e76 Fix event error on firefox 1.6. 2012-11-22 00:30:49 -03:00
Paulo Gustavo Veiga
dd1698b5d9 Fix sharing. 2012-11-22 00:22:39 -03:00
Paulo Gustavo Veiga
e1e9c9ebeb Minot fix. 2012-11-20 00:17:33 -03:00
Paulo Gustavo Veiga
4062b6771c Fix some issues. 2012-11-20 00:11:06 -03:00
Paulo Gustavo Veiga
b717a5f910 Remove add from editor. 2012-11-19 21:59:40 -03:00
Paulo Gustavo Veiga
1602421544 Another try. 2012-11-19 21:56:39 -03:00
Paulo Gustavo Veiga
fe44da9b43 Move add to right. 2012-11-19 21:49:56 -03:00
Paulo Gustavo Veiga
2a8ae4c397 Change add location. 2012-11-19 21:19:30 -03:00
Paulo Gustavo Veiga
0aa2d67698 Add a small add to test. 2012-11-18 19:29:10 -03:00
Paulo Gustavo Veiga
2549305621 Add more adds . 2012-11-18 13:38:17 -03:00
Paulo Gustavo Veiga
dbbe8901b7 Move add to fixed. 2012-11-17 18:00:55 -03:00
Paulo Gustavo Veiga
91f27c4e10 Fix ads on editor. 2012-11-17 17:47:11 -03:00
Paulo Gustavo Veiga
fab3c96097 Minor fix for add. 2012-11-17 15:57:02 -03:00
Paulo Gustavo Veiga
b89b08b7b3 Add add to login page and editor page. 2012-11-17 15:43:06 -03:00
Paulo Gustavo Veiga
2e0339492d Add german support. 2012-11-16 22:47:18 -03:00
Paulo Gustavo Veiga
cba00adc41 Fix embedded url 2012-11-10 20:34:04 -03:00
Paulo Gustavo Veiga
a228ea6ed5 Split rest authentication into two. For web apps integration url is /c/restful/ 2012-11-10 19:53:04 -03:00
Paulo Gustavo Veiga
6a9d1c684e Add dialog message support. 2012-11-07 20:14:07 -03:00
Paulo Gustavo Veiga
fe8516bb94 Merge branch 'master' into db-purge 
Conflicts:
	wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
 2012-11-05 20:40:54 -03:00
Paulo Gustavo Veiga
37b4298579 Fix Apache Proxy configuration property. 2012-11-04 18:17:32 -03:00
Paulo Gustavo Veiga
6303ba93c7 Edition lock is working. Working on user interation. 2012-11-01 21:35:00 -03:00
Paulo Gustavo Veiga
a179875fee - Finish exclusive locking support. 2012-11-01 21:35:00 -03:00
Paulo Gustavo Veiga
dbf8b0e28c - Add restriction to the input name for the map 
- Translate some pending resources.
 2012-09-28 20:35:31 -03:00
Paulo Gustavo Veiga
14e9bf0e06 - TypeError: $("#userSettingsBtn") is null, line:4 2012-09-26 19:42:24 -03:00
Paulo Gustavo Veiga
f8fb56e49f - Add tab as option to creating a child node. 2012-09-26 19:31:41 -03:00
Paulo Gustavo Veiga
f6b1499322 - Ups. Complete footer rename. 2012-09-24 19:34:57 -03:00
Paulo Gustavo Veiga
56ac4aaed3 Add button refers to http://www.wisemapping.com 2012-09-23 11:40:45 -03:00
Paulo Gustavo Veiga
a42c54678a Minor analytics refector. 2012-09-23 10:26:26 -03:00
Paulo Gustavo Veiga
88f5f1a5bd - Try to catch more exception details. 2012-09-22 21:34:43 -03:00
Paulo Gustavo Veiga
7c4f500361 - Fix error on IE9 on sharing ... 2012-09-19 23:12:47 -03:00
Paulo Gustavo Veiga
4ec8e75bdb i18n forgot password. 2012-09-18 21:17:57 -03:00
Paulo Gustavo Veiga
7246260220 - Fix the problem tha public links where not properly displayed. 2012-09-17 22:20:22 -03:00
Paulo Gustavo Veiga
e1d4f0afc8 - Fix login button bug when the form produces an error. 2012-09-17 00:35:39 -03:00
Paulo Gustavo Veiga
849cb4a9ce - Fix wrong redirection path. 2012-09-17 00:25:06 -03:00
Paulo Gustavo Veiga
de64764306 - Fix wrong redirection path. 2012-09-16 23:53:57 -03:00
Paulo Gustavo Veiga
36a35b44d7 - Replace Browser user agent detection 2012-09-16 18:36:23 -03:00
Paulo Gustavo Veiga
f90dd4f22a - Footer lt staayout 2012-09-16 16:05:10 -03:00
Paulo Gustavo Veiga
f1c9c95ed5 - Fix layout 2012-09-15 12:59:56 -03:00
Paulo Gustavo Veiga
4c988d4ae2 - Footer is more positioned in the bottom 2012-09-12 23:29:57 -03:00
Paulo Gustavo Veiga
0cbe108910 Add added to the top. 2012-09-11 02:01:52 -03:00
Paulo Gustavo Veiga
3fb746f79b - Change to start using bootstrap grid 2012-09-11 01:47:23 -03:00
Paulo Gustavo Veiga
6efc068a6c Fix editor.js url location. 2012-09-10 14:45:44 -03:00
Paulo Gustavo Veiga
861d265891 - Fix MooDialog.Request.active is null 2012-09-08 14:32:43 -03:00
Paulo Gustavo Veiga
dfb5bb7c3a Change tracking info 2012-09-02 02:58:06 -03:00
Paulo Gustavo Veiga
154a442428 Add support for homepage configuration. 2012-09-01 14:38:19 -03:00
Paulo Gustavo Veiga
00829bfcc4 Remove svgXML on get action. 2012-08-31 22:53:56 -03:00
Paulo Gustavo Veiga
052494a6a5 Fix export problem when the windows is closed. Some code was moved to the iframeDialog. 2012-08-31 20:51:55 -03:00
Paulo Gustavo Veiga
6dce37d794 Add Italian Languange Support. 2012-08-31 20:21:21 -03:00
Paulo Gustavo Veiga
a580dceaea Move ads div to the footer. 2012-08-31 01:04:57 -03:00
Paulo Gustavo Veiga
d1ce3540ed Fix messages locale display. 
Add Google Ads.
 2012-08-31 00:46:46 -03:00
Paulo Gustavo Veiga
9be46d6822 Fix minor display issue when the list of items is bigger than 10. 2012-08-30 23:40:53 -03:00
Paulo Gustavo Veiga
3efd3ef172 Add google analitycs to the footer. 2012-08-30 23:26:15 -03:00
Paulo Gustavo Veiga
1cb7a3d3d7 - Fix missing translation for welcome map. 2012-08-30 23:19:11 -03:00
Paulo Gustavo Veiga
b808fcdbb8 Remove try from export. 2012-08-30 21:48:21 -03:00
Paulo Gustavo Veiga
592886519e - Read only mode remove actions over topic icons 
- Fix other JS Injection issues.
 2012-08-29 20:30:50 -03:00
Paulo Gustavo Veiga
96de014d52 Fix Javascript Injection bugs. 2012-08-29 19:42:24 -03:00
Paulo Gustavo Veiga
a442c487e4 Fix iframeWindow.submitDialogForm is not a function, line:4, :http://app.wisemapping.com/c/maps/163/edit 
null
 2012-08-28 08:41:49 -03:00
Paulo Gustavo Veiga
e42af6a952 Fix concurrency issue. 2012-08-27 21:56:39 -03:00
Paulo Gustavo Veiga
f961f7f071 Several try fixes. 2012-08-27 14:13:27 -03:00
Paulo Gustavo Veiga
e2682108e0 Fix chinese location ids. 2012-08-23 22:46:28 -03:00
Paulo Gustavo Veiga
7fa7d8ca8b Minor issue with locales. 2012-08-23 22:34:07 -03:00
Paulo Gustavo Veiga
dcd15d8fa4 Fix resources generation bug 
Add support for try.
 2012-08-23 22:07:37 -03:00
Paulo Gustavo Veiga
c191136de9 Add automatic conversion of UTF-8 properties to ASCII 2012-08-23 00:46:15 -03:00
Paulo Gustavo Veiga
9aba9993e2 Merge branch 'master' of repo.wisemapping.org:wisemapping/wiseorg 2012-08-22 00:43:00 -03:00
Paulo Gustavo Veiga
448c9e55e7 Fix embed map issue. 2012-08-22 00:42:01 -03:00
Paulo Gustavo Veiga
3e7f02907c Add in footer contact information. 2012-08-21 23:52:47 -03:00
Gonzalo Bellver
db6a9d90b4 Added French locale 2012-08-21 23:34:28 -03:00
Paulo Gustavo Veiga
f6953aad9c Default editor colors appear in the pallete. 
Remove discard changes button.
 2012-08-17 09:47:46 -03:00
Paulo Gustavo Veiga
5f441c2c20 - IE window.open does not support base href tag. Fixed. 2012-08-15 21:37:21 -03:00
Paulo Gustavo Veiga
78274fe3f2 - Fix login tabindex order issue... 2012-08-15 00:07:03 -03:00
Paulo Gustavo Veiga
09ed4f68b7 - Improve email notification cases for unexpected exceptions. 2012-08-14 23:55:13 -03:00
Paulo Gustavo Veiga
16bbc0a456 - Swap zoom buttons 2012-07-15 23:40:13 -03:00
Paulo Gustavo Veiga
d304909a86 Minor licence correction. 2012-07-15 19:27:20 -03:00
Paulo Gustavo Veiga
1cd65e347b Open Term and Conditions in a different page. 2012-07-15 02:56:49 -03:00
Paulo Gustavo Veiga
5d82ccc552 Add Term Of Use missing page. 2012-07-15 02:53:41 -03:00
Paulo Gustavo Veiga
1ac80626b4 Remove username from the mindmap info. 2012-07-15 02:04:53 -03:00
Paulo Gustavo Veiga
853aa0ad5c Remove username attribute 2012-07-15 01:05:30 -03:00
Paulo Gustavo Veiga
41c1113058 Fix dialogs in firefox. 2012-07-13 01:08:12 -03:00
Paulo Gustavo Veiga
99ee5a7da9 - Fix footer layout. 2012-07-11 23:54:41 -03:00
Paulo Gustavo Veiga
8175eea928 - Add support for copy and paste. 2012-07-08 18:41:35 -03:00
Paulo Gustavo Veiga
b816d12842 Fix several I18n isssues. 2012-07-06 00:46:54 -03:00
Paulo Gustavo Veiga
aedab95b4a Add chinese support. 2012-07-05 23:34:06 -03:00
Paulo Gustavo Veiga
5cf9756ed3 Add support for revert changes ... 2012-07-04 02:21:05 -03:00
Paulo Gustavo Veiga
61d0fcbdf6 Add Google Analitycs to the footer. 2012-07-03 00:04:44 -03:00
Paulo Gustavo Veiga
31c86d053d Fix collapse using keybard. 2012-07-02 22:54:59 -03:00
Paulo Gustavo Veiga
1df9afda1b Change default font style. 2012-07-02 00:39:22 -03:00
Paulo Gustavo Veiga
ada0f6c679 Add Keyboard Shorcuts Support. 2012-07-02 00:06:26 -03:00
Paulo Gustavo Veiga
d3447d1142 More wrong paths fixed... 2012-07-01 22:42:18 -03:00
Paulo Gustavo Veiga
4770601190 Minor fix for some wrong paths ... 2012-07-01 22:34:01 -03:00