ZhouXY108
/
wisemapping-open-source
mirror of https://github.com/wisemapping/wisemapping-open-source.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,624 Commits
2 Branches
29 Tags
25 MiB
Commit Graph

1624 Commits (a6eeecbbf76835a603171e492784773f44a4a7cb)

Author SHA1 Message Date
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
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 adb0ab4891 Merged WISE-209-new-map-is-not-working-on-ie-10 into develop 2014-02-09 23:11:38 -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