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 |
|
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 |
|
Paulo Gustavo Veiga
|
356ab4b1c1
|
Created new branch WISE-209-new-map-is-not-working-on-ie-10
|
2014-02-09 06:18:36 +00: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
|
d23595a75c
|
update
|
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
|
1444be36ce
|
Merge remote-tracking branch 'origin/develop' into feature/WISE-15-mindmapListFolderSupport
Conflicts:
config/database/hsql/drop-schemas.sql
config/database/mysql/drop-schemas.sql
wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java
wise-webapp/src/main/webapp/js/mindmapList.js
|
2014-02-06 02:10:54 -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 |
|
Ezequiel Bergamaschi
|
105c0544e1
|
removing comment line
|
2014-02-05 21:21:37 -03:00 |
|
Ezequiel Bergamaschi
|
29acc46d34
|
solving merge conflict
|
2014-02-05 21:21:00 -03:00 |
|
Ezequiel Bergamaschi
|
6fe9dcf578
|
comment save
|
2014-02-05 02:27:33 -03:00 |
|
Ezequiel Bergamaschi
|
d555309c22
|
moving api methods to MindmapController
|
2014-02-05 02:11:23 -03:00 |
|
Ezequiel Bergamaschi
|
d089b471fc
|
remove classes of relationship
|
2014-02-05 02:10:12 -03:00 |
|
Claudio Barril
|
7525ba4820
|
Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user
|
2014-02-04 22:18:29 -03:00 |
|
Claudio Barril
|
58390dfb92
|
Merge remote-tracking branch 'origin/develop' into feature/WISE-16-remove_user
|
2014-02-04 22:18:29 -03:00 |
|
Paulo Gustavo Veiga
|
b765a21369
|
Bug https://wisemapping.atlassian.net/browse/WISE-209 fixed.
|
2014-02-03 22:01:38 -03:00 |
|
Paulo Gustavo Veiga
|
560ceffaaf
|
Bug https://wisemapping.atlassian.net/browse/WISE-209 fixed.
|
2014-02-03 22:01:38 -03:00 |
|
Ezequiel Bergamaschi
|
f3cc90d9d0
|
removing unnecesaries js
|
2014-02-03 01:26:05 -03:00 |
|
Ezequiel Bergamaschi
|
434fb4c8f5
|
remove hex input of color picker
|
2014-02-03 01:07:24 -03:00 |
|
Ezequiel Bergamaschi
|
57e5fcac3a
|
remove preventDefault
|
2014-02-03 00:46:51 -03:00 |
|
Ezequiel Bergamaschi
|
b99cb2f8a3
|
adding icons and change label msg
|
2014-02-03 00:46:35 -03:00 |
|
Ezequiel Bergamaschi
|
ea95ba0ec7
|
extract method
|
2014-02-02 23:34:40 -03:00 |
|
Ezequiel Bergamaschi
|
3cf726f928
|
fix multiple request (I hope)
|
2014-02-02 23:34:20 -03:00 |
|