1346 Commits

Author	SHA1	Message	Date
Paulo Gustavo Veiga	e244d694f5	Update Spring dependencies.	2022-01-04 18:20:30 -08:00
Paulo Gustavo Veiga	307d8ea2b8	Remove JAXB, now supporting any version of JAVA	2022-01-04 13:07:05 -08:00
Paulo Gustavo Veiga	758e18dffc	Clean up code	2022-01-04 13:00:39 -08:00
Paulo Gustavo Veiga	0885c9e27e	Add missing records	2022-01-03 17:39:11 -08:00
Paulo Gustavo Veiga	7153b0b103	Remove transformers	2022-01-03 16:49:28 -08:00
Paulo Gustavo Veiga	628d819325	Move tests to front-end	2021-12-31 09:37:22 -08:00
Paulo Gustavo Veiga	71fefdd8c6	Remove Image export support. It will be moved to the front end.	2021-12-31 09:13:07 -08:00
Paulo Gustavo Veiga	ac7fd7e706	Add image support on toolbar	2021-12-30 22:52:00 -08:00
Paulo Gustavo Veiga	c387eca16c	Clean up images, now are embeded.	2021-12-30 22:30:22 -08:00
Paulo Gustavo Veiga	b7d6bcb5d9	Modernize toolbar	2021-12-27 23:28:21 -08:00
Paulo Gustavo Veiga	955a363ce5	Improve public view	2021-12-26 09:23:51 -08:00
Paulo Gustavo Veiga	fbc9a978f2	Working on fixing mindplot loading	2021-12-25 23:30:57 -08:00
Paulo Gustavo Veiga	9cb4018ce4	Fix mindplot public view issue	2021-12-25 22:55:22 -08:00
Paulo Gustavo Veiga	b3e26caee4	Fix major update integrating with external wisemapping frond end	2021-12-24 18:03:23 -08:00
Paulo Gustavo Veiga	39ff095df7	Remove openid	2020-11-28 15:48:40 -08:00
Paulo Gustavo Veiga	cade40e1a3	Add ads support	2020-11-24 19:50:49 -08:00
Paulo Gustavo Veiga	4e0c621994	Bump up version.	2020-11-23 19:39:34 -08:00
Paulo Gustavo Veiga	e8a246d980	Adjust number of iterations to 12 for BCrypt	2020-11-23 18:27:29 -08:00
Paulo Gustavo Veiga	7a5b4ca75a	Fix regression bug.	2020-11-23 18:17:48 -08:00
Paulo Gustavo Veiga	3ef7f6a7f0	Fix create user error.	2020-11-22 17:41:20 -08:00
Paulo Gustavo Veiga	dcd04df8df	Update admin password for testing purposes.	2020-11-22 14:41:33 -08:00
Paulo Gustavo Veiga	939478cda5	Bump to 5.0.1-SNAPSHOT	2020-11-22 13:18:03 -08:00
Paulo Gustavo Veiga	ddb7de8c63	Update version	2020-11-22 13:14:05 -08:00
Paulo Gustavo Veiga	306c34d7d5	Fix log level on hibernate. ... Fix footer.	2020-11-22 13:12:03 -08:00
Paulo Gustavo Veiga	62fa88cb3e	Update favicon	2020-11-22 13:01:26 -08:00
Paulo Gustavo Veiga	3a006f1fbc	Fix error on mindmap publish & details	2020-11-22 12:53:35 -08:00
Paulo Gustavo Veiga	64411c6232	Fix wrong query.	2020-11-08 15:42:51 -08:00
Paulo Gustavo Veiga	2a485b71db	Copy Sha1 implementationo	2020-11-08 15:29:42 -08:00
Paulo Gustavo Veiga	df88b7d0ff	Fix password encription	2020-11-08 13:43:38 -08:00
Paulo Gustavo Veiga	49c459f386	Merge branch 'feature/migration-spring5' of bitbucket.org:wisemapping/wisemapping-open-source into feature/migration-spring5	2020-11-08 13:36:09 -08:00
Paulo Gustavo Veiga	430b30bffb	Fix password encoder for compatibility	2020-11-08 12:08:13 -08:00
Paulo Gustavo Veiga	1a524434da	Update JDBC drivers for mysql & others...	2020-11-07 18:44:53 -08:00
Paulo Gustavo Veiga	4778433466	Update to tiles 3 version	2020-11-07 14:46:20 -08:00
Paulo Gustavo Veiga	c230fb4f3e	Fix ClassNotFound starting Hibernate	2020-11-07 14:42:00 -08:00
Paulo Gustavo Veiga	e4af8acdc2	Initial commit	2020-11-07 11:56:38 -08:00
Paulo Gustavo Veiga	ad9cea069a	Support for Java 11	2020-11-06 21:35:54 -08:00
Paulo Gustavo Veiga	542c0c33e0	Disable timestamp control. Issue seems to be related to changes in the JDBC driver.	2020-07-29 12:32:20 -07:00
Paulo Gustavo Veiga	535141c28f	Disable timestamp control. Issue seems to be related to changes in the JDBC driver.	2020-07-29 12:30:44 -07:00
Paulo Gustavo Veiga	57a71427c3	Disable brower support check. This was required because the validation is failing with some new version of Chrome.	2020-04-30 21:15:52 -07:00
Paulo Veiga	70a1862351	Bump up version	2018-09-16 18:37:13 -07:00
Paulo Veiga	b324415c18	Fix test	2018-09-16 18:27:42 -07:00
Paulo Veiga	e138923694	Hack for workaround batik OOM	2018-09-16 18:06:47 -07:00
Paulo Veiga	b89a82760c	Update batik	2018-09-16 13:05:11 -07:00
Paulo Veiga	752aff4e5f	Fix several minor issues.	2018-09-16 12:29:19 -07:00
Paulo Veiga	146e84d790	Fix bug on based URL generation	2018-09-15 01:25:14 -07:00
Paulo Veiga	936dae2209	Bump up version	2018-09-14 23:16:35 -07:00
Paulo Veiga	4234ca7e38	Upgrade Spring version. ... Fix failing export tests	2018-09-14 23:08:34 -07:00
Paulo Veiga	57b2e79c0d	Update batik library. ... Fix sample SVG tests.	2018-09-14 17:33:36 -07: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	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
Ezequiel Bergamaschi	10ff33be13	fixing wrong reference variable	2014-04-19 14:18:35 -03:00
Paulo Gustavo Veiga	1f61a40e5c	Update ads codes.	2014-04-18 19:48:09 -03:00
Paulo Gustavo Veiga	fccbf7b996	Update analitics tracking code.	2014-04-18 19:13:55 -03:00
Ezequiel Bergamaschi	7ea9da3512	popovers for icons in label icon chooser	2014-04-17 01:29:44 -03:00
Claudio Barril	8b679bae00	fixing tests broken because refactor of label attribute icon	2014-04-16 10:29:36 -03:00
Claudio Barril	96068e05d4	label icon list reduced	2014-04-16 03:00:00 -03:00
Claudio Barril	ff327c5b5c	jsp include for label icon list	2014-04-16 02:59:33 -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	4c54bc5cad	adding icon to tags list (when tagging) and some style	2014-04-16 02:25:07 -03:00
Ezequiel Bergamaschi	9d86fdd7e1	adding css for color chooser	2014-04-16 01:57:42 -03:00
Ezequiel Bergamaschi	5206d3b627	removing fixme from dialogForm function	2014-04-16 01:48:09 -03:00
Claudio Barril	0f3d4856d2	fix tests	2014-04-16 00:25:32 -03:00
Claudio Barril	1a7bae563e	import label list from another jsp prototype	2014-04-14 18:14:56 -03:00
Claudio Barril	25783d8152	sending icon data to api rest	2014-04-14 18:14:32 -03:00
Claudio Barril	bf26c4c0ef	add styles	2014-04-14 18:10:16 -03:00
Claudio Barril	8e7133c4ab	add label icons back-end (model and database)	2014-04-14 18:09:34 -03:00
Claudio Barril	725be7ca9b	icon ui selection	2014-04-12 19:04:28 -03:00
Claudio Barril	e8567fccf0	icon dropdown creation dialog	2014-04-12 19:04:19 -03:00
Claudio Barril	a0f4024d26	icon message	2014-04-12 19:03:31 -03:00
Claudio Barril	df821e754e	fix padding and label in two lines	2014-04-09 00:13:38 -03:00
Mariela Michalek	5d8dc697b0	revert "update bootstrap modal dialog" ... This reverts commit 690b653092.	2014-04-02 15:28:59 -03:00
Mariela Michalek	f22c0de2ad	update bootstrap modal dialog	2014-04-01 07:24:00 -03:00
Paulo Gustavo Veiga	678e5ff5ce	Remove Events class from moootools library.	2014-03-16 11:30:37 -03:00
Ezequiel Bergamaschi	e5b9de1cc8	Revert "new header" ... This reverts commit 251f0eca46. Conflicts: wise-webapp/src/main/webapp/jsp/header.jsp	2014-03-14 23:59:16 -03:00
Ezequiel Bergamaschi	9ca7b7d8e4	bootstrap 13px	2014-03-14 23:57:23 -03:00
Ezequiel Bergamaschi	9dc195cc4b	bootstrap 12px and 13px	2014-03-14 23:48:05 -03:00
Ezequiel Bergamaschi	2a3878faae	orange buttons new header	2014-03-13 00:41:45 -03:00
Ezequiel Bergamaschi	9f69c30b25	updating webdefault.xml	2014-03-12 23:42:30 -03:00
Ezequiel Bergamaschi	d29bba4b64	updating jetty version and removing old config	2014-03-12 23:42:20 -03:00
Ezequiel Bergamaschi	5c299bad10	reducing delete dialog size	2014-03-12 01:53:47 -03:00
Ezequiel Bergamaschi	d830fd6f33	bootstrap recompiled with base font size 12px	2014-03-12 01:41:36 -03:00
Ezequiel Bergamaschi	e8e5954cea	avoid override bootstrap nav-pills class	2014-03-11 23:43:45 -03:00
Ezequiel Bergamaschi	e6e05e6be3	new header	2014-03-10 01:22:30 -03:00
Ezequiel Bergamaschi	16985ae7d7	rows clickeables	2014-03-10 00:12:49 -03:00
Ezequiel Bergamaschi	2b5c1518f4	css and animation fadeIn	2014-03-09 23:41:39 -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	58be9c0848	Revert "rename parameter" ... This reverts commit 29894a276e.	2014-03-09 22:08:46 -03:00
Claudio Barril	73f48b6de5	force linkLabel to use view security in mindmap service	2014-03-09 02:34:20 -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	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	74a817e63d	Fix login color h1.	2014-02-12 00:55:04 -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	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	c7674825a6	style change..	2014-02-11 01:36:19 -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	6299f43067	fix focus on modal	2014-02-11 00:43:20 -03:00
Ezequiel Bergamaschi	c78b8db81c	fix color picker on background	2014-02-11 00:43:04 -03:00
Ezequiel Bergamaschi	788cb1ea98	fixing ui	2014-02-11 00:18:46 -03:00
Ezequiel Bergamaschi	6b73dd10b1	Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport ... Conflicts: wise-webapp/src/main/webapp/jsp/mindmapList.jsp	2014-02-10 22:16:48 -03:00
Ezequiel Bergamaschi	572eb44e7a	Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport ... Conflicts: wise-webapp/src/main/webapp/bootstrap/css/bootstrap.css wise-webapp/src/main/webapp/bootstrap/css/bootstrap.min.css wise-webapp/src/main/webapp/css/mindmapList.less wise-webapp/src/main/webapp/js/mindmapList.js wise-webapp/src/main/webapp/jsp/mindmapList.jsp	2014-02-10 01:07:50 -03:00
Ezequiel Bergamaschi	1d6e3ec4bf	new tests added	2014-02-10 00:59:13 -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
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
Mariela Michalek	1a31e5ee99	Refactor Imports and Helper	2014-02-09 18:37:10 -03:00
Mariela Michalek	d48abe6121	refactor test - add helper class	2014-02-09 17:50:57 -03:00
Mariela Michalek	f564b4b34a	rename test	2014-02-09 15:19:07 -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
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
Ezequiel Bergamaschi	a9c1d42925	fix animate on delete	2014-02-08 18:54:14 -03:00
Ezequiel Bergamaschi	08a9289893	filter list appears all simultaneously	2014-02-08 18:25:32 -03:00
Ezequiel Bergamaschi	3df00e9e0e	dialog modal with focus and submit on enter	2014-02-08 17:54:10 -03:00
Ezequiel Bergamaschi	b3e2e37929	fix animate bug	2014-02-08 17:53:47 -03:00
Ezequiel Bergamaschi	7f6d575c16	animation on bubble hover	2014-02-07 06:08:40 -03:00
Ezequiel Bergamaschi	10b9a4ceb2	bubbles	2014-02-07 06:08:40 -03:00
Ezequiel Bergamaschi	a3c6ce10c2	animation on create an delete tags	2014-02-07 06:08:40 -03:00
Ezequiel Bergamaschi	ba90addad2	fixing the annoying duplicate key on link label to maps	2014-02-06 00:44:36 -03:00
Ezequiel Bergamaschi	cfa669fe2e	adding hibernate config	2014-02-05 21:55:37 -03:00
Ezequiel Bergamaschi	efb7e0cc3b	fix add label UI	2014-02-05 21:44:30 -03:00
Ezequiel Bergamaschi	668506ceb8	adding missing msgs	2014-02-05 21:25:59 -03:00
Ezequiel Bergamaschi	105c0544e1	removing comment line	2014-02-05 21:21:37 -03:00
Ezequiel Bergamaschi	29acc46d34	solving merge conflict	2014-02-05 21:21:00 -03:00
Ezequiel Bergamaschi	6fe9dcf578	comment save	2014-02-05 02:27:33 -03:00
Ezequiel Bergamaschi	d555309c22	moving api methods to MindmapController	2014-02-05 02:11:23 -03:00
Ezequiel Bergamaschi	d089b471fc	remove classes of relationship	2014-02-05 02:10:12 -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
Claudio Barril	58390dfb92	Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user	2014-02-04 22:18:29 -03:00
Paulo Gustavo Veiga	b765a21369	Bug https://wisemapping.atlassian.net/browse/WISE-209 fixed.	2014-02-03 22:01:38 -03:00
Paulo Gustavo Veiga	560ceffaaf	Bug https://wisemapping.atlassian.net/browse/WISE-209 fixed.	2014-02-03 22:01:38 -03:00