Mariela Michalek
|
5d8dc697b0
|
revert "update bootstrap modal dialog"
This reverts commit 690b653092 .
|
2014-04-02 15:28:59 -03:00 |
|
Mariela Michalek
|
f22c0de2ad
|
update bootstrap modal dialog
|
2014-04-01 07:24:00 -03:00 |
|
Paulo Gustavo Veiga
|
678e5ff5ce
|
Remove Events class from moootools library.
|
2014-03-16 11:30:37 -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
|
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 |
|
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
|
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
|
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
|
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 |
|
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 |
|
Ezequiel Bergamaschi
|
460d8270c6
|
remove commented code
|
2014-02-02 23:33:41 -03:00 |
|
Paulo Gustavo Veiga
|
079606c4e7
|
Change the unexpecter error message.
|
2014-02-02 22:56:40 -03:00 |
|
Claudio Barril
|
d67a16f550
|
ui support of untag mindmap
|
2014-02-02 04:10:00 -03:00 |
|
Claudio Barril
|
8db7f5015f
|
api for unlink mindmaps
|
2014-02-02 04:09:28 -03:00 |
|
Ezequiel Bergamaschi
|
734463d233
|
css on 'x' mouse over
|
2014-02-02 03:02:01 -03:00 |
|
Ezequiel Bergamaschi
|
fdf041e8b1
|
adding scrollbar support
|
2014-02-02 02:22:58 -03:00 |
|
Ezequiel Bergamaschi
|
23611c8d54
|
fix select all issue
|
2014-02-02 02:01:37 -03:00 |
|
Ezequiel Bergamaschi
|
729d2e98f7
|
palette with default value
|
2014-02-02 01:35:19 -03:00 |
|
Ezequiel Bergamaschi
|
baa8adacda
|
datatype workaround
|
2014-02-02 01:28:14 -03:00 |
|
Ezequiel Bergamaschi
|
7a535b1dca
|
css and fix jquery problems
|
2014-02-02 01:26:56 -03:00 |
|
Ezequiel Bergamaschi
|
632a9a6e00
|
ordering labels on mindmap retreive
|
2014-02-02 01:26:28 -03:00 |
|
Ezequiel Bergamaschi
|
a4aa1c5436
|
tag label with x to delete tag from mindmap
|
2014-02-01 23:33:38 -03:00 |
|
Ezequiel Bergamaschi
|
9a19e2a5eb
|
some button actions
|
2014-02-01 23:33:38 -03:00 |
|
Paulo Gustavo Veiga
|
6d1a00291e
|
Fix jQuery resturn status.
|
2014-02-01 22:48:01 -03:00 |
|
Paulo Gustavo Veiga
|
d6656dffc0
|
Fix jQuery resturn status.
|
2014-02-01 22:48:01 -03:00 |
|
Paulo Gustavo Veiga
|
3b23fead8e
|
Fix another typo.
|
2014-02-01 19:54:31 -03:00 |
|
Paulo Gustavo Veiga
|
94b043ecf5
|
Fix another typo.
|
2014-02-01 19:54:31 -03:00 |
|
Paulo Gustavo Veiga
|
c8286c26aa
|
Fix minor typo.
|
2014-02-01 19:50:37 -03:00 |
|
Paulo Gustavo Veiga
|
f567513468
|
Fix minor typo.
|
2014-02-01 19:50:37 -03:00 |
|
Paulo Gustavo Veiga
|
472bb38342
|
Change the unexpecter error message.
|
2014-02-01 19:47:33 -03:00 |
|