1005 Commits

Author	SHA1	Message	Date
Claudio Barril	e1a28027db	removing comparasion hack and fixing order to compare versions	2014-08-20 23:30:24 -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
Paulo Gustavo Veiga	756afef4b6	Bug WISE-242 fixed ... Add support for Firefox 3	2014-06-25 21:26:58 -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
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