Commit Graph

1648 Commits (8003ef73bf2e2070dcecd43a77aef76b14c4dc92)

Author SHA1 Message Date
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
Claudio Barril 6f44429972 update mysql schemas population 2014-03-19 23:29:00 -03:00
Claudio Barril 8da140a67f update hsql schemas population 2014-03-19 23:28:46 -03:00
Paulo Gustavo Veiga 26058e3d81 Merged feature/WISE-220-mindmapListImprovements into develop 2014-03-16 11:34: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
Paulo Gustavo Veiga e229ed96e4 Merged WISE-217-fixMindmapsAreShowingOtherUserLabels into develop 2014-03-08 23:58: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 1c530a0460 Remove console.log messsage. 2014-02-12 14:37:04 -03:00
Paulo Gustavo Veiga 3f478de905 Fix modal dialogs loading ... 2014-02-12 14:37:04 -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