492 Commits

Author	SHA1	Message	Date
Paulo Gustavo Veiga	5db868bb56	Return to java 1.7	2015-11-02 08:57:12 -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	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	4474d7fb0b	WISE-383 #resolve	2015-04-25 01:06:06 -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
Paulo Gustavo Veiga	dff870e3ee	Improve detection of version in freemind.	2015-03-24 22:30:51 -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
Claudio Barril	77a087277a	fix exporter to freemind issues (shape, font styles and font sizes)	2014-09-08 14:36:49 -03:00
Claudio Barril	eadea5e442	freemind constant	2014-09-07 23:15:27 -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	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
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	e1a28027db	removing comparasion hack and fixing order to compare versions	2014-08-20 23:30:24 -03:00
Paulo Gustavo Veiga	756afef4b6	Bug WISE-242 fixed ... Add support for Firefox 3	2014-06-25 21:26:58 -03:00
Claudio Barril	8b679bae00	fixing tests broken because refactor of label attribute icon	2014-04-16 10:29:36 -03:00
Claudio Barril	b427747f9a	label attribute icon to iconName refactor (because of eze code review)	2014-04-16 02:38:33 -03:00
Claudio Barril	0f3d4856d2	fix tests	2014-04-16 00:25:32 -03:00
Claudio Barril	8e7133c4ab	add label icons back-end (model and database)	2014-04-14 18:09:34 -03:00
Ezequiel Bergamaschi	58be9c0848	Revert "rename parameter" ... This reverts commit 29894a276e.	2014-03-09 22:08:46 -03:00
Claudio Barril	d7cfa0de04	renaming method addLabel to linkLabel	2014-03-09 02:34:20 -03:00
Claudio Barril	78859324a1	select only my labels from all mindmap labels	2014-03-08 16:29:43 -03:00
Claudio Barril	c6b7e48d7a	rename parameter	2014-03-08 16:29:42 -03:00
Claudio Barril	de515c572c	remove unused exception and class	2014-03-08 16:29:42 -03:00
Paulo Gustavo Veiga	135c956406	Merge branch 'feature/WISE-15-mindmapListFolderSupport' into develop	2014-03-04 16:11:52 -03:00
Mariela Michalek	d36c52b40a	add new label test	2014-02-25 22:19:52 -03:00
Paulo Gustavo Veiga	6c20ed025a	Fix display lock message.	2014-02-17 09:05:54 -03:00
Ezequiel Bergamaschi	e9ca68732e	get label by id with user and validate label exists on link to mindmap	2014-02-11 02:04:09 -03:00
Ezequiel Bergamaschi	dfefd6da40	warning in yellow	2014-02-11 01:05:31 -03:00
Ezequiel Bergamaschi	83e51a6501	return location on header	2014-02-10 00:58:42 -03:00
Ezequiel Bergamaschi	5733dbf45e	color validation	2014-02-10 00:58:29 -03:00
Ezequiel Bergamaschi	b110d338af	attributes nullable	2014-02-10 00:58:19 -03:00
Mariela Michalek	147a4ec06a	adding new suite test	2014-02-09 13:57:00 -03:00
Mariela Michalek	c81439cae8	Revert "deleting unnecessary XML annotation" ... This reverts commit f65149c948.	2014-02-09 12:25:21 -03:00
Ezequiel Bergamaschi	efb7e0cc3b	fix add label UI	2014-02-05 21:44:30 -03:00
Ezequiel Bergamaschi	29acc46d34	solving merge conflict	2014-02-05 21:21:00 -03:00