Commit Graph

2444 Commits

Author SHA1 Message Date
Paulo Gustavo Veiga
4824d7643d Return to java 1.7. Why ?. Spring does not like it. 2015-11-02 08:57:21 -03:00
Paulo Gustavo Veiga
5db868bb56 Return to java 1.7 2015-11-02 08:57:12 -03:00
Paulo Gustavo Veiga
a5ee4475e1 Fix typo... 2015-11-01 21:53:38 -03:00
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
2ee977c501 Merge remote-tracking branch 'origin/develop'
Conflicts:
	core-js/pom.xml
	mindplot/pom.xml
	pom.xml
	web2d/pom.xml
	wise-editor/pom.xml
	wise-webapp/pom.xml
2015-10-29 23:06:57 -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
Paulo Gustavo Veiga
4acc9ec50f Move to Java 1.8. 2015-07-04 11:02:48 -03:00
Mariela Michalek
f414e94fe5 fix focus link editor 2015-05-31 11:12:27 -03:00
Ezequiel Bergamaschi
d15a97ef02 fix error stack not reporting to autolog 2015-05-09 17:30:00 -03:00
Paulo Gustavo Veiga
69a3889ca2 Update lattest version. 2015-05-09 12:10:39 -03:00
Paulo Gustavo Veiga
b722d5035b Finish Docker implementation. 2015-05-09 12:08:53 -03:00
Paulo Gustavo Veiga
cb1ff39d54 Initial version of Dockerfile generation. 2015-05-09 11:02:09 -03:00
Ezequiel Bergamaschi
740de21ea1 adding error stack information to error reporter 2015-05-09 04:55:40 -03:00
Ezequiel Bergamaschi
f57e98309a fix underscorejs.min.map not found 2015-05-09 02:44:28 -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
Paulo Gustavo Veiga
7782dea327 Change to 4.0.2 2015-04-29 11:33:32 -07:00
Ezequiel Bergamaschi
3546b3ae82 fix escape key not working in firefox 2015-04-27 23:15:14 -03: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
0199dee9ef testing bamboo repository polling 2015-04-19 15:07:59 -03:00
Ezequiel Bergamaschi
baa9ad6924 jasmine specs running in mindplot 2015-04-19 14:57:42 -03:00
Ezequiel Bergamaschi
05e8b3e7bb fix bug when clicking cancel button for modal windows 2015-04-19 14:57:12 -03:00
Mariela Michalek
db48ef67f4 fix duplicate insert 2015-04-12 21:14:37 -03:00
Paulo Gustavo Veiga
e7ce96fd30 Merged WISE-436-fixErrorChangingRoleInSharing into develop 2015-04-12 16:11:36 -03:00
Paulo Gustavo Veiga
9caa90db63 Format some .js. 2015-04-12 11:08:30 -03:00
Paulo Gustavo Veiga
113a93f48a Update copyright headers. 2015-04-12 00:15:12 -03:00
Paulo Gustavo Veiga
2f26b19250 Bug WA-57 fixed. #resolve 2015-04-11 19:41:45 -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
2914f5b256 Serialize paramters to json to post. 2015-04-10 00:28:45 -03:00
Paulo Gustavo Veiga
15d7ae1c1d Minor fix to unify paths. 2015-04-10 00:07:40 -03:00
Paulo Gustavo Veiga
33b9a679d3 Enable JS error reporting. 2015-04-09 23:37:39 -03:00
Ezequiel Bergamaschi
89772a9e6e Merged in christinaKorger/wisemapping-open-source (pull request #3)
clean-up
2015-04-04 17:09:06 -03:00
Christina Korger
c1cf798e2e Merged wisemapping/wisemapping-open-source into develop 2015-04-04 22:07:07 +02:00
Christina Korger
9d136df1fe revert commit b4b1c6d
Backed out changeset: f1dbc1a70afc
(probable future relevance to image dragging support)

--HG--
branch : clean-up
2015-04-04 20:45:36 +02: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
Christina Korger
f6a80bb8bf Bug/Task WISE-429 fixed: mark publicly used Designer functions as public by
removing '_' for function definition and calls:

_nodeModelToNodeGraph -> nodeModelToNodeGraph
_addRelationship -> addRelationship
_deleteRelationship -> deleteRelationship
_removeTopic -> removeTopic

--HG--
branch : clean-up
2015-03-30 14:10:26 +02:00
Christina Korger
78f1805fd0 Bug/Task WISE-430 fixed: clean-up Designer - remove unused function
addDraggedNode

--HG--
branch : clean-up
2015-03-30 11:41:08 +02:00
Christina Korger
feead16974 Bug/Task WISE-428 fixed: clean-up Designer - remove unused functions
de-/activateKeyboard with calls to non-existing methods

--HG--
branch : clean-up
2015-03-30 11:29:58 +02:00
Christina Korger
90893f70e2 Merged wisemapping/wisemapping-open-source into develop 2015-03-25 09:07:43 +01:00
Ezequiel Bergamaschi
b485086b4e Bug WISE-393 #resolve 2015-03-25 01:36:47 -03:00
Ezequiel Bergamaschi
91a2f22549 Bug WISE-393 fixed: empty commit, see the previous one 2015-03-25 01:34:04 -03:00