1000 Commits

Author	SHA1	Message	Date
Ezequiel Bergamaschi	fff27e1bb7	fix alias checking for jetty 9.x	2014-06-19 00:43:10 -03:00
Michael Magill	e273c52f59	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	d7ca087182	Mir fix on label.	2014-04-26 21:08:13 -03:00
Paulo Gustavo Veiga	d6a60636ed	Merged feature/WISE-211-iconSupportOnLabels into develop	2014-04-26 15:44:36 -03:00
Michael Magill	b886a5888a	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	cec140b1fd	changed default security.ldap.subDn parameter to include "ou="	2014-04-25 20:36:48 +00:00
Michael Magill	84cffac713	removed extra / from site.baseurl	2014-04-25 20:30:18 +00:00
Ezequiel Bergamaschi	754d4b3dcf	fixing wrong reference variable	2014-04-19 14:18:35 -03:00
Paulo Gustavo Veiga	7ee577c400	Update ads codes.	2014-04-18 19:48:09 -03:00
Paulo Gustavo Veiga	c854c1b377	Update analitics tracking code.	2014-04-18 19:13:55 -03:00
Ezequiel Bergamaschi	bfe24b7dfb	popovers for icons in label icon chooser	2014-04-17 01:29:44 -03:00
Claudio Barril	85c7e3ce5c	fixing tests broken because refactor of label attribute icon	2014-04-16 10:29:36 -03:00
Claudio Barril	27304ea385	label icon list reduced	2014-04-16 03:00:00 -03:00
Claudio Barril	8a994ee6f5	jsp include for label icon list	2014-04-16 02:59:33 -03:00
Claudio Barril	5ec3b6cce1	label attribute icon to iconName refactor (because of eze code review)	2014-04-16 02:38:33 -03:00
Claudio Barril	8cd05ec37e	adding icon to tags list (when tagging) and some style	2014-04-16 02:25:07 -03:00
Ezequiel Bergamaschi	5a00229390	adding css for color chooser	2014-04-16 01:57:42 -03:00
Ezequiel Bergamaschi	4b01f7c8ee	removing fixme from dialogForm function	2014-04-16 01:48:09 -03:00
Claudio Barril	edb91b92bd	fix tests	2014-04-16 00:25:32 -03:00
Claudio Barril	c6ae7be255	import label list from another jsp prototype	2014-04-14 18:14:56 -03:00
Claudio Barril	86ba19c120	sending icon data to api rest	2014-04-14 18:14:32 -03:00
Claudio Barril	183ab33729	add styles	2014-04-14 18:10:16 -03:00
Claudio Barril	9e992a8f61	add label icons back-end (model and database)	2014-04-14 18:09:34 -03:00
Claudio Barril	5d18283285	icon ui selection	2014-04-12 19:04:28 -03:00
Claudio Barril	d66666010d	icon dropdown creation dialog	2014-04-12 19:04:19 -03:00
Claudio Barril	bddf867b63	icon message	2014-04-12 19:03:31 -03:00
Claudio Barril	d0d161e8ab	fix padding and label in two lines	2014-04-09 00:13:38 -03:00
Ezequiel Bergamaschi	3d6df8a143	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	dec0fb7aef	bootstrap 13px	2014-03-14 23:57:23 -03:00
Ezequiel Bergamaschi	980a984499	bootstrap 12px and 13px	2014-03-14 23:48:05 -03:00
Ezequiel Bergamaschi	1f8e251009	orange buttons new header	2014-03-13 00:41:45 -03:00
Ezequiel Bergamaschi	4729022d6a	updating webdefault.xml	2014-03-12 23:42:30 -03:00
Ezequiel Bergamaschi	eb9a28603c	updating jetty version and removing old config	2014-03-12 23:42:20 -03:00
Ezequiel Bergamaschi	d191aa9075	reducing delete dialog size	2014-03-12 01:53:47 -03:00
Ezequiel Bergamaschi	e585686bd2	bootstrap recompiled with base font size 12px	2014-03-12 01:41:36 -03:00
Ezequiel Bergamaschi	44b3707005	avoid override bootstrap nav-pills class	2014-03-11 23:43:45 -03:00
Ezequiel Bergamaschi	251f0eca46	new header	2014-03-10 01:22:30 -03:00
Ezequiel Bergamaschi	1bdf75e295	rows clickeables	2014-03-10 00:12:49 -03:00
Ezequiel Bergamaschi	ccdab5257b	css and animation fadeIn	2014-03-09 23:41:39 -03:00
Ezequiel Bergamaschi	797a4adfd4	small searcher	2014-03-09 23:41:17 -03:00
Ezequiel Bergamaschi	3b64577d15	small buttons	2014-03-09 23:41:00 -03:00
Ezequiel Bergamaschi	06fc95c454	Revert "rename parameter" ... This reverts commit 29894a276e.	2014-03-09 22:08:46 -03:00
Claudio Barril	0c15789c4b	force linkLabel to use view security in mindmap service	2014-03-09 02:34:20 -03:00
Claudio Barril	ae31613fdd	renaming method addLabel to linkLabel	2014-03-09 02:34:20 -03:00
Claudio Barril	29037e60d8	select only my labels from all mindmap labels	2014-03-08 16:29:43 -03:00
Claudio Barril	29894a276e	rename parameter	2014-03-08 16:29:42 -03:00
Claudio Barril	db0595ac7e	remove unused exception and class	2014-03-08 16:29:42 -03:00
Paulo Gustavo Veiga	bf8345908b	Merge branch 'feature/WISE-15-mindmapListFolderSupport' into develop	2014-03-04 16:11:52 -03:00
Mariela Michalek	d111c54f15	add new label test	2014-02-25 22:19:52 -03:00
Paulo Gustavo Veiga	6a5eb910b5	Fix display lock message.	2014-02-17 09:05:54 -03:00