vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-23 14:37:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,298 Commits 10 Branches 29 Tags 26 MiB
8b6ef7536e
Commit Graph

395 Commits

Author SHA1 Message Date
Paulo Gustavo Veiga
0c433352c5 Minor fix. 2012-11-14 20:53:59 -03:00
Paulo Gustavo Veiga
07c8a1d8c7 Update session for the same user. 2012-11-14 20:44:59 -03:00
Paulo Gustavo Veiga
6560973237 Replace all User.equals for Collaborator.identityEquality 2012-11-14 20:35:09 -03:00
Paulo Gustavo Veiga
596aeeebc4 Keep fixing user issues. 2012-11-14 20:33:42 -03:00
Paulo Gustavo Veiga
16e59a0879 Fix collaboration equal issue. 2012-11-14 20:17:55 -03:00
Paulo Gustavo Veiga
2861a7b5f9 Fix user comparator. 2012-11-14 20:00:46 -03:00
Paulo Gustavo Veiga
b1172f16cc Fix more lock issues. 2012-11-13 21:01:04 -03:00
Paulo Gustavo Veiga
71762ff629 Add more debug. 2012-11-13 13:44:33 -03:00
Paulo Gustavo Veiga
00fd168489 Keep fixing session issues. 2012-11-13 13:34:35 -03:00
Paulo Gustavo Veiga
df98282620 Improve error reporting. 2012-11-11 20:23:21 -03:00
Paulo Gustavo Veiga
0f66d6fb6d Push not read only. 2012-11-10 20:22:26 -03:00
Paulo Gustavo Veiga
e302171ac9 Merge branch 'master' into db-purge 2012-11-10 20:02:44 -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
10f8b5748e Fix site.location resolution. Evironment seems not be be resolved . 2012-11-07 20:47:15 -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
c86bd15382 Fix unit tests. 2012-11-04 01:51:23 -03:00
Paulo Gustavo Veiga
aed1c0afcb Fix wrong merge. 2012-11-04 01:40:40 -03:00
Paulo Gustavo Veiga
a74efa4647 Merge branch 'master' into db-purge 
Conflicts:
	mindplot/src/main/javascript/MainTopic.js
	wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
	wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java
 2012-11-04 01:38:52 -03:00
Paulo Gustavo Veiga
cf0f0a8c00 Do not print exception message. 2012-11-04 01:15:46 -03:00
Paulo Gustavo Veiga
52ce817e3a Fix integration tests execution. 2012-11-04 01:06:02 -03:00
Paulo Gustavo Veiga
45a190bbac Merge branch 'images' 
Conflicts:
	mindplot/src/main/javascript/StandaloneActionDispatcher.js
 2012-11-02 02:08:28 -03:00
Paulo Gustavo Veiga
27a82d9e41 Fix NPE with empty node text. 2012-11-02 00:47:55 -03:00
Paulo Gustavo Veiga
806bb96ce1 Fix error when the connections in the pool has been closed. 2012-11-02 00:38:13 -03:00
Paulo Gustavo Veiga
9067a6cff2 Fix error when the connections in the pool has been closed. 2012-11-01 23:29:18 -03:00
Paulo Gustavo Veiga
ef88ee06de Merge branch 'db-purge' of repo.wisemapping.org:wisemapping/wiseorg into db-purge 
Conflicts:
	wise-webapp/src/test/resources/data/freemind/richtextnode.mmr
 2012-11-01 21:43:27 -03:00
Paulo Gustavo Veiga
af8d833356 Update copyright year. 2012-11-01 21:35:01 -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
04d43e62c7 - Change MYSQL blob to mediumblob. 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
e5e2e86fce Fix parser error on export. 2012-11-01 00:14:21 -03:00
Paulo Gustavo Veiga
dafe8eeb03 Fix i18n during import. 2012-10-31 23:14:13 -03:00
Paulo Gustavo Veiga
a155477eff Fix import NPE. 2012-10-05 20:42:32 -03:00
Paulo Gustavo Veiga
cc57fae5cf Update copyright year. 2012-10-05 08:35:31 -03:00
Paulo Gustavo Veiga
d17b8397f7 Edition lock is working. Working on user interation. 2012-10-04 20:28:59 -03:00
Paulo Gustavo Veiga
ad9d00843f Add Opera 12 support to the list. 2012-10-03 00:27:19 -03:00
Paulo Gustavo Veiga
742fa9d03e - Add Opera 11 support. 2012-10-03 00:26:11 -03:00
Paulo Gustavo Veiga
3fdbcb31d3 - Change MYSQL blob to mediumblob. 2012-10-01 23:14:25 -03:00
Paulo Gustavo Veiga
3672d2a8e2 - Finish exclusive locking support. 2012-10-01 00:22:17 -03:00
Paulo Gustavo Veiga
4f1bb45fc2 Minor improvement to change freemind change if the background color was defined. 2012-09-29 17:38:51 -03:00
Paulo Gustavo Veiga
c37b632ac9 Fix FeeMind size conversion. Now it's mapped to the proper wise size. 2012-09-29 16:53:43 -03:00
Paulo Gustavo Veiga
c7f7b20260 Fix wrong exception mapping. 2012-09-29 15:42:41 -03:00
Paulo Gustavo Veiga
9985384a7f Improve freemind imported to support html text nodes. 2012-09-29 15:27:16 -03:00
Paulo Gustavo Veiga
295fbba387 - Add freemind import exception data on failure. 2012-09-29 12:39:20 -03:00
Paulo Gustavo Veiga
acd149bfc9 - Add more info to detect errors. 2012-09-24 13:15:24 -03:00
Paulo Gustavo Veiga
155ec74dea - Add more info to detect errors. 2012-09-24 13:11:11 -03:00
Paulo Gustavo Veiga
8a8922f2a6 - Minot fix on password recovery. 2012-09-19 23:33:52 -03:00
Paulo Gustavo Veiga
6555203a94 - Fix java.lang.NullPointerException 
at com.wisemapping.util.Browser.isInUserAgentString(Browser.java:267)
      	at com.wisemapping.util.Browser.checkUserAgent(Browser.java:2 issue.
 2012-09-19 19:24:30 -03:00
Paulo Gustavo Veiga
f8cb849597 Add more logs. 2012-09-19 09:02:21 -03:00
Paulo Gustavo Veiga
a19003077c Fix NPE when browser version can not be detected. 2012-09-18 21:02:44 -03:00
Paulo Gustavo Veiga
662fc82919 Wheel enabled on read only maps 
Fix NPE on mobile firefox on UserAgent
MindmapList display list fix on read only maps.
 2012-09-18 20:46:04 -03:00
Paulo Gustavo Veiga
029bfa809a Fix NPE on Firefox mobile. 2012-09-18 10:47:14 -03:00
Paulo Gustavo Veiga
c44d88eb09 - Add some automatic tests to detect user agent. 2012-09-16 21:45:58 -03:00
Paulo Gustavo Veiga
66e214ca88 Another minor stupid fix. 2012-09-16 21:25:59 -03:00
Paulo Gustavo Veiga
bb26d73462 Add IE8 to the list. 2012-09-16 21:22:22 -03:00
Paulo Gustavo Veiga
7b1574150a - Add Safari 6 to the supported matrix. 2012-09-16 20:47:13 -03:00
Paulo Gustavo Veiga
1400130ebf Fix @NotNull import. 2012-09-16 20:05:12 -03:00
Paulo Gustavo Veiga
a0ea9a6980 - Add support for serialized sessions... 2012-09-16 20:02:08 -03:00
Paulo Gustavo Veiga
36a35b44d7 - Replace Browser user agent detection 2012-09-16 18:36:23 -03:00
Paulo Gustavo Veiga
15e03c690f - Filter collaborators from export. 2012-09-15 11:35:53 -03:00
Paulo Gustavo Veiga
e0a67fe1d7 - Fix User.parameter Conflict on JSON 2012-09-14 22:43:47 -03:00
Paulo Gustavo Veiga
b4f036745f Minor fix. 2012-09-14 11:02:28 -03:00
Paulo Gustavo Veiga
5719e54091 Hack for wron encoding on UTF chars. 2012-09-14 10:55:59 -03:00
Paulo Gustavo Veiga
5c9a10b878 - Catch IO exceptions during JSON deserialization 2012-09-13 09:21:30 -03:00
Paulo Gustavo Veiga
011acba666 Minor fix. 2012-09-13 00:35:46 -03:00
Paulo Gustavo Veiga
a1199687d4 Fix problem opening public maps. 2012-09-13 00:17:49 -03:00
Paulo Gustavo Veiga
69912ecef4 Fix service.xml fie. 2012-09-11 21:24:23 -03:00
Paulo Gustavo Veiga
a263a05520 Minor permissions modification. 2012-09-11 21:09:37 -03:00
Paulo Gustavo Veiga
2e2e978c43 - Fix IE 9 issue that true value is serialized as number instead of boolean string. 2012-09-11 20:46:53 -03:00
Paulo Gustavo Veiga
1e53ba827f - Fix java.lang.NullPointerException,at java.util.regex.Matcher.getTextLength(Matcher.java:1140) exception. 2012-09-11 20:30:00 -03:00
Paulo Gustavo Veiga
d811c8f011 Handle validations exceptions. 2012-09-11 14:02:06 -03:00
Paulo Gustavo Veiga
3fb746f79b - Change to start using bootstrap grid 2012-09-11 01:47:23 -03:00
Paulo Gustavo Veiga
db49d96b97 - Fix image URL on sharing. 2012-09-10 13:16:52 -03:00
Paulo Gustavo Veiga
e83fa28ae8 Relax and add support for Firefox 10 and Chrome 18. 2012-09-09 19:13:53 -03:00
Paulo Gustavo Veiga
84fcad2688 Fix compilation. 2012-09-09 19:04:34 -03:00
Paulo Gustavo Veiga
3f2b343a06 Detect Google Mediapartners browser. 2012-09-09 19:02:41 -03:00
Paulo Gustavo Veiga
c15c1824b3 Fix stack overflow 2012-09-08 12:27:50 -03:00
Paulo Gustavo Veiga
8321363333 Add freemind converted. 2012-09-08 12:01:26 -03:00
Paulo Gustavo Veiga
8d9fb53741 Minor fix. 2012-09-07 19:49:36 -03:00
Paulo Gustavo Veiga
4cce432bb8 Add debug information on broken input streams. 2012-09-07 19:40:08 -03:00
Paulo Gustavo Veiga
337a67a8f6 Fix ReCaptha NPE 
Improve error handling when permission are removed.
 2012-09-06 23:52:53 -03:00
Paulo Gustavo Veiga
6008376ad5 - Add Mediapartners-Google add sense crawler 2012-09-03 21:39:40 -03:00
Paulo Gustavo Veiga
04a221799a Add filter for avoiding multiple emails on error reporting. 2012-09-02 18:24:15 -03:00
Paulo Gustavo Veiga
8839b8d333 Enable Google Boot to craw the site. 2012-09-01 13:01:28 -03:00
Paulo Gustavo Veiga
b855da47d0 Add more info to notification email. 2012-08-31 20:56:51 -03:00
Paulo Gustavo Veiga
7390025bf4 Fix wrong base exception handlers. 2012-08-31 01:00:30 -03:00
Paulo Gustavo Veiga
d1ce3540ed Fix messages locale display. 
Add Google Ads.
 2012-08-31 00:46:46 -03:00
Paulo Gustavo Veiga
45858f393e Improve report information. 2012-08-30 21:23:10 -03:00
Paulo Gustavo Veiga
df52d57a1d Bug java.lang.NullPointerException 
at com.wisemapping.exporter.FreemindExporter.addNote(FreemindExporter.java:170)
fixed.
 2012-08-30 20:43:56 -03:00
Paulo Gustavo Veiga
396ed9a147 Fix NPE during export. 2012-08-29 23:51:33 -03:00
Paulo Gustavo Veiga
878a040708 Extends exception info ... 2012-08-28 01:34:15 -03:00
Paulo Gustavo Veiga
80deb4922b Fix export issue on tranformation on SVG maps produced by IE9. 2012-08-28 00:13:50 -03:00
Paulo Gustavo Veiga
30c13905c0 Fix NPE retriving history if the editor is null. 2012-08-27 22:24:59 -03:00
Paulo Gustavo Veiga
601cbe6d25 Fix try mode ... 2012-08-27 12:52:24 -03:00
Paulo Gustavo Veiga
ad190b575d Fix href export login. 2012-08-26 22:50:39 -03:00
Paulo Gustavo Veiga
666cf329a8 Hack for IE. 2012-08-26 20:03:38 -03:00
Paulo Gustavo Veiga
1265d978e8 Change error reporting subject. 2012-08-26 19:45:12 -03:00
Paulo Gustavo Veiga
4c93a72072 Do no report errors on security exceptions. 2012-08-26 17:12:25 -03:00
Paulo Gustavo Veiga
183f472f52 Fix exception handing.: 2012-08-26 17:02:24 -03:00
Paulo Gustavo Veiga
c4f3feb92e Several fixes. 2012-08-26 16:53:33 -03:00
Paulo Gustavo Veiga
46831e110b Fix locale resolver issue with the languange. 2012-08-23 23:55:26 -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
73056de872 Enable welcome maps for all languages 
Fix some spanish typos.
 2012-08-23 20:29:07 -03:00
Gonzalo Bellver
4cd765cfb9 Added Mindmap.java 2012-08-16 21:51:59 -03:00
Gonzalo Bellver
73b72a32da removed MindMap.java 2012-08-16 21:50:09 -03:00
Paulo Gustavo Veiga
2e8b166b8a Fix default language swith ... 2012-08-16 19:42:25 -03:00
Paulo Gustavo Veiga
5a765b2f2c On editor error, send notification emails. 2012-08-15 21:45:57 -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
09ed4f68b7 - Improve email notification cases for unexpected exceptions. 2012-08-14 23:55:13 -03:00
Paulo Gustavo Veiga
f2cdc96a96 - Start working on a I18n tutorial mindmap. 2012-07-17 01:20:47 -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
9257638da2 Fix error importing freeming mindmaps. 2012-07-15 01:50:47 -03:00
Paulo Gustavo Veiga
853aa0ad5c Remove username attribute 2012-07-15 01:05:30 -03:00
Paulo Gustavo Veiga
b05e25b43f Add welcome message on creation ... 2012-07-13 21:07:51 -03:00
Paulo Gustavo Veiga
a82439975d - Fix unit tests ... 2012-07-12 23:56:04 -03:00
Paulo Gustavo Veiga
6582f073bd - Fix mindmap img export support. Now images are embedded in the SVG. 2012-07-12 21:00:22 -03:00
Paulo Gustavo Veiga
8da65a9102 Fix error connecting to the central node. 2012-07-06 23:59:54 -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
0cb142d3fd Remove the loading text from dialog ... 2012-07-01 19:11:48 -03:00
Paulo Gustavo Veiga
7752ac0dc1 Integrate Designer location with the editor ... 2012-07-01 17:54:46 -03:00
Paulo Gustavo Veiga
cd46647602 Improve message for SMTP server not configured. 2012-06-30 19:16:18 -03:00
Paulo Gustavo Veiga
8e103f44c8 More I18n changes. 2012-06-30 16:30:04 -03:00
Paulo Gustavo Veiga
43aa3e2aea Fix change locale. 2012-06-30 02:56:18 -03:00
Paulo Gustavo Veiga
dd74a7a63d Partial support for locale in spanish. 2012-06-30 02:26:21 -03:00
Paulo Gustavo Veiga
ec41dafcf5 - Fix duplicate map bug. 2012-06-24 20:25:27 -03:00
Paulo Gustavo Veiga
ee93a8f7ab Fix minor issue in drop tables. 2012-06-23 16:31:31 -03:00
Paulo Gustavo Veiga
3349f2e567 Audith login operations. 2012-06-23 16:15:59 -03:00
Paulo Gustavo Veiga
c8837baadd Add report notification by email support. 2012-06-23 14:39:50 -03:00
Paulo Gustavo Veiga
10e869ab70 Add Google Crome Frame support. 2012-06-21 22:18:04 -03:00
Paulo Gustavo Veiga
a5bf5b8d57 Fix Browser detection filter. 2012-06-21 20:16:13 -03:00
Paulo Gustavo Veiga
f49448d22f Minor fixes. 2012-06-20 18:01:02 -03:00
Paulo Gustavo Veiga
509a31a4ed Fix image export 2012-06-20 17:48:29 -03:00
Paulo Gustavo Veiga
cfe78bdf7e Finish account settings option. 2012-06-20 13:28:45 -03:00
Paulo Gustavo Veiga
d751f2be55 Fix remember me issue. 2012-06-18 01:15:46 -03:00
Paulo Gustavo Veiga
251ea5edb6 Add embedded and public view compatibility. 
Remove Utils method
 2012-06-18 00:40:42 -03:00
Paulo Gustavo Veiga
f25ea3a377 Solve expcetion on editor exception on starred for a viewer. 2012-06-17 23:23:14 -03:00
Paulo Gustavo Veiga
29091dec88 Show collaboration role on details. 2012-06-17 22:48:33 -03:00
Paulo Gustavo Veiga
521111fac2 Fix toolbar title bug 
Add properties peer user.
 2012-06-17 21:43:34 -03:00
Paulo Gustavo Veiga
c73934aadf Add revert and view actions. 2012-06-17 19:16:39 -03:00
Paulo Gustavo Veiga
26766fdbc6 Add readOnly support to the mindmapList. 2012-06-17 12:24:09 -03:00
Paulo Gustavo Veiga
5e67811dcf Finish mindmapHistory rest service. 2012-06-17 03:51:28 -03:00
Paulo Gustavo Veiga
33131d4e9e Migrate UserRegitration to MVC 3.0. 
wisemapping-servlet.xml is not used anymore.
 2012-06-16 19:27:22 -03:00
Paulo Gustavo Veiga
ea2bff60f7 Login Migrated to MVC 3.0 2012-06-16 17:03:17 -03:00
Paulo Gustavo Veiga
7d6b82c626 - Fix forgot password email 
- Rewrite forgot password to use the new MVC model.
- Show a dialog when the password has been sent.
 2012-06-16 16:01:27 -03:00
Paulo Gustavo Veiga
2f52856ea1 - Add custom message support 2012-06-16 11:37:40 -03:00