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,611 Commits
2 Branches
29 Tags
25 MiB
Commit Graph

955 Commits (690b65309221051be64502a463c840d096281834)

Author SHA1 Message Date
Mariela Michalek 690b653092 update bootstrap modal dialog 2014-04-01 07:24:00 -03:00
Paulo Gustavo Veiga e1a357c8c9 Remove Events class from moootools library. 2014-03-16 11:30:37 -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
Ezequiel Bergamaschi 8462e54293 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 8be0f19792 Move adsense location 2014-02-12 01:00:12 -03:00
Paulo Gustavo Veiga 44dbce0801 Fix login color h1. 2014-02-12 00:55:04 -03:00
Paulo Gustavo Veiga 878fe464ea Reference bootstrap min. 
Fin export dialog.
 2014-02-12 00:20:06 -03:00
Paulo Gustavo Veiga 68fd71d300 Fix no closed div element on account settings. 2014-02-11 23:27:46 -03:00
Paulo Gustavo Veiga 73e955afac Fix table hover issue. 2014-02-11 21:45:29 -03:00
Ezequiel Bergamaschi ea4684d9c8 get label by id with user and validate label exists on link to mindmap 2014-02-11 02:04:09 -03:00
Ezequiel Bergamaschi 0b021c7602 style change.. 2014-02-11 01:36:19 -03:00
Ezequiel Bergamaschi 1de1a9f55f warning in yellow 2014-02-11 01:05:31 -03:00
Ezequiel Bergamaschi 60d75b6f2d code indendt 2014-02-11 00:48:48 -03:00
Ezequiel Bergamaschi ae71b1331f fix focus on modal 2014-02-11 00:43:20 -03:00
Ezequiel Bergamaschi c56698d085 fix color picker on background 2014-02-11 00:43:04 -03:00
Ezequiel Bergamaschi 7299c7d506 fixing ui 2014-02-11 00:18:46 -03:00
Ezequiel Bergamaschi 9e8f73df99 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 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
Paulo Gustavo Veiga 2b89fdccca Fix registration, login 2014-02-09 04:19:39 -03:00
Paulo Gustavo Veiga 6624abb9ed Fix login. 2014-02-09 04:03:43 -03:00
Paulo Gustavo Veiga 726ffcd817 First corrections. 
Fix more styling issues.

Conflicts:
	wise-webapp/src/main/webapp/jsp/accountSettings.jsp
 2014-02-09 03:26:51 -03:00
Ezequiel Bergamaschi a9c1d42925 fix animate on delete 2014-02-08 18:54:14 -03:00
Ezequiel Bergamaschi 08a9289893 filter list appears all simultaneously 2014-02-08 18:25:32 -03:00
Ezequiel Bergamaschi 3df00e9e0e dialog modal with focus and submit on enter 2014-02-08 17:54:10 -03:00
Ezequiel Bergamaschi b3e2e37929 fix animate bug 2014-02-08 17:53:47 -03:00
Ezequiel Bergamaschi 7f6d575c16 animation on bubble hover 2014-02-07 06:08:40 -03:00
Ezequiel Bergamaschi 10b9a4ceb2 bubbles 2014-02-07 06:08:40 -03:00
Ezequiel Bergamaschi a3c6ce10c2 animation on create an delete tags 2014-02-07 06:08:40 -03:00
Ezequiel Bergamaschi ba90addad2 fixing the annoying duplicate key on link label to maps 2014-02-06 00:44:36 -03:00
Ezequiel Bergamaschi cfa669fe2e adding hibernate config 2014-02-05 21:55:37 -03:00
Ezequiel Bergamaschi efb7e0cc3b fix add label UI 2014-02-05 21:44:30 -03:00
Ezequiel Bergamaschi 668506ceb8 adding missing msgs 2014-02-05 21:25:59 -03:00