2489 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Paulo Gustavo Veiga	d1a5bd56f9	Merged feature/WISE-211-iconSupportOnLabels into develop	2014-04-26 15:44:36 -03:00
Paulo Gustavo Veiga	78cbf3e307	Merged in ldap-changes (pull request #1) ... move 'ou=' from being hardcoded to part of security.ldap.subDn	2014-04-26 15:39:29 -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	928d65b024	FloatingTip in ToolbarItem deleted	2014-04-21 00:34:23 -03:00
Ezequiel Bergamaschi	258abc232f	fixing some old refs	2014-04-21 00:34:01 -03:00
Ezequiel Bergamaschi	eef8865774	FloatingTip as bootstrap popover	2014-04-20 23:57:39 -03:00
Ezequiel Bergamaschi	200d5c517a	KeyboardShortcutTooltip reimplemented	2014-04-19 16:47:11 -03:00
Mariela Michalek	a56850d214	add open link functionality	2014-04-19 16:38:04 -03:00
Mariela Michalek	3ef2cd48b9	refactor note and link editors	2014-04-19 16:28:28 -03:00
Mariela Michalek	86bf506c64	update remove button	2014-04-19 16:25:28 -03: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
Mariela Michalek	66e769cab0	set styles	2014-04-18 17:54:24 -03:00
Mariela Michalek	98e798bfce	update editors with remove button	2014-04-18 17:13:44 -03:00
Mariela Michalek	e5b5e28843	fade in remove button	2014-04-18 17:12:36 -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
Mariela Michalek	f401410e81	update accept button	2014-04-12 15:11:39 -03:00
Mariela Michalek	771833e8f2	update editor's events	2014-04-12 15:00:51 -03:00
Mariela Michalek	8dcf0be662	conflict linkEditor	2014-04-10 19:35:39 -03:00
Mariela Michalek	8b396768d5	update bootstrapDialog	2014-04-10 19:33:48 -03:00
Mariela Michalek	3df56a4d97	update editors	2014-04-10 19:33:20 -03:00
Ezequiel Bergamaschi	679f13ebd6	adding configuration for mindplot module	2014-04-10 01:06:50 -03:00
Ezequiel Bergamaschi	45a8bd4454	jasmine maven plugin dependency declared in parent pom	2014-04-10 00:53:48 -03:00
Claudio Barril	df821e754e	fix padding and label in two lines	2014-04-09 00:13:38 -03:00
Ezequiel Bergamaschi	51b5907ed5	removing css class	2014-04-06 18:31:28 -03:00
Ezequiel Bergamaschi	87c2f3dcd3	removing custom class .btn-primary, keep bootstrap	2014-04-06 18:24:16 -03:00
Ezequiel Bergamaschi	63959d086a	fixing bug	2014-04-03 22:56:11 -03:00
Ezequiel Bergamaschi	363284f5d1	Merge remote-tracking branch 'origin/feature/remove_mootols' into feature/remove_mootols ... Conflicts: mindplot/src/main/javascript/widget/LinkEditor.js	2014-04-03 22:42:21 -03:00
Ezequiel Bergamaschi	9518fbf6d0	BootstrapDialog and fixing LinkEditor	2014-04-03 22:39:23 -03:00
Mariela Michalek	8823303442	update link and note editor	2014-04-02 15:57:32 -03:00
Mariela Michalek	5d8dc697b0	revert "update bootstrap modal dialog" ... This reverts commit 690b653092.	2014-04-02 15:28:59 -03:00
Mariela Michalek	5ce15f6ca5	update bootstrapDialog	2014-04-02 15:19:54 -03:00