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
|
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 |
|
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 |
|
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
|
05e8b3e7bb
|
fix bug when clicking cancel button for modal windows
|
2015-04-19 14:57:12 -03:00 |
|
Paulo Gustavo Veiga
|
e7ce96fd30
|
Merged WISE-436-fixErrorChangingRoleInSharing into develop
|
2015-04-12 16:11:36 -03:00 |
|
Paulo Gustavo Veiga
|
113a93f48a
|
Update copyright headers.
|
2015-04-12 00:15:12 -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
|
15d7ae1c1d
|
Minor fix to unify paths.
|
2015-04-10 00:07:40 -03: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 |
|
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 |
|
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 |
|
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 |
|
Paulo Gustavo Veiga
|
2a10642188
|
Add undercorejs.js as dependency.
|
2015-01-31 23:38:17 -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 |
|
Claudio Barril
|
4d00c49458
|
undo jasmine plugin removed from poms
|
2015-01-11 12:16:47 -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
|
dc58509a0f
|
still removing .bind(this) usages
|
2014-12-26 18:07:31 -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 |
|
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
|
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
|
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
|
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 |
|
Ezequiel Bergamaschi
|
63b8c32d63
|
trigger event when dialog is shown to perform custom dialog actions
|
2014-09-11 14:38:49 -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 |
|
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
|
438bb5a7d6
|
fix view history of maps
|
2014-09-09 13:50:17 -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
|
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 |
|
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
|
696ac88330
|
fix side as first level nodes are drawn
|
2014-08-25 23:32:17 -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
|
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
|
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 |
|
Paulo Gustavo Veiga
|
756afef4b6
|
Bug WISE-242 fixed
Add support for Firefox 3
|
2014-06-25 21:26:58 -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 |
|
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
|
634cd3e8be
|
Mir fix on label.
|
2014-04-26 21:08:13 -03:00 |
|
Paulo Gustavo Veiga
|
d1a5bd56f9
|
Merged feature/WISE-211-iconSupportOnLabels into develop
|
2014-04-26 15:44:36 -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 |
|