Claudio Barril
|
cb80d5e976
|
add test for version comparison
|
2014-09-07 21:02:04 -03:00 |
|
Claudio Barril
|
68b8428439
|
fixing files to test export
|
2014-09-07 20:20:03 -03:00 |
|
Ezequiel Bergamaschi
|
0df077d14b
|
mindmap export bug fixing
|
2014-09-07 20:17:59 -03:00 |
|
Claudio Barril
|
01071a9236
|
setting default version for freemind export
|
2014-09-07 20:16:23 -03:00 |
|
Claudio Barril
|
72ee23849f
|
considering possibility of null positions
|
2014-09-07 20:16:09 -03:00 |
|
Claudio Barril
|
37b2cc7466
|
remove console printing for debugging
|
2014-09-07 18:51:19 -03:00 |
|
Claudio Barril
|
bf5ae3b0de
|
hack fix for relationships when import/export for freemind
|
2014-09-07 16:58:14 -03:00 |
|
Claudio Barril
|
2a121f91d2
|
fix vertical order when export to freemind versions.
|
2014-09-07 16:10:06 -03:00 |
|
Claudio Barril
|
26a18ae7d0
|
support both export versions for freemind (old and new 1.0.1)
|
2014-09-07 16:06:58 -03:00 |
|
Ezequiel Bergamaschi
|
2459a14c9b
|
BootstrapDialog.Request implementation
|
2014-09-01 02:45:15 -03:00 |
|
Claudio Barril
|
369f015af2
|
fix drawn and freemind test
|
2014-08-30 22:42:28 -03:00 |
|
Claudio Barril
|
696ac88330
|
fix side as first level nodes are drawn
|
2014-08-25 23:32:17 -03:00 |
|
Claudio Barril
|
c4a4424364
|
fixing import dialog, parameters modification and redirect
|
2014-08-20 23:31:14 -03:00 |
|
Claudio Barril
|
e1a28027db
|
removing comparasion hack and fixing order to compare versions
|
2014-08-20 23:30:24 -03:00 |
|
Ezequiel Bergamaschi
|
8bfdda82b7
|
Revert "Revert "new header""
This reverts commit 3d6df8a143 .
|
2014-08-18 21:54:41 -03:00 |
|
Ezequiel Bergamaschi
|
b923e21bce
|
Merge remote-tracking branch 'origin/develop' into feature/remove_mootols
Conflicts:
wise-editor/src/main/webapp/js/less.js
wise-webapp/pom.xml
wise-webapp/src/main/webapp/js/less.js
|
2014-08-18 21:35:45 -03:00 |
|
Ezequiel Bergamaschi
|
c282a80b5d
|
fix less update and restoring symblinks
|
2014-08-18 21:23:42 -03:00 |
|
Ezequiel Bergamaschi
|
a6eeecbbf7
|
Revert "fix alias checking for jetty 9.x"
This reverts commit fff27e1bb7 .
|
2014-08-18 21:10:25 -03:00 |
|
Ezequiel Bergamaschi
|
46fd579933
|
old jetty pom
|
2014-08-18 21:09:56 -03:00 |
|
Ezequiel Bergamaschi
|
4705a4e612
|
adding symlink for bootstrap in wise-webapp
|
2014-07-29 02:30:51 -03:00 |
|
Ezequiel Bergamaschi
|
8df2441a66
|
remove wise-webapp bootstrap
|
2014-07-29 02:30:08 -03:00 |
|
Ezequiel Bergamaschi
|
21e5850ee5
|
adding js resources to jsp
|
2014-07-14 02:45:39 -03:00 |
|
Ezequiel Bergamaschi
|
71154ca05a
|
updating some pom versions
|
2014-07-14 02:43:24 -03:00 |
|
Ezequiel Bergamaschi
|
6ab59967d2
|
loading dialog added
|
2014-07-14 00:12:23 -03:00 |
|
Ezequiel Bergamaschi
|
367a6d7cb7
|
change old addEvent method call by .on()
|
2014-07-14 00:11:56 -03:00 |
|
Ezequiel Bergamaschi
|
fedef3cbac
|
restore symlink for less.js
|
2014-07-14 00:11:17 -03:00 |
|
Ezequiel Bergamaschi
|
a6fabc5a5a
|
Merge remote-tracking branch 'origin/develop' into feature/remove_mootols
|
2014-07-13 02:39:19 -03:00 |
|
Paulo Gustavo Veiga
|
756afef4b6
|
Bug WISE-242 fixed
Add support for Firefox 3
|
2014-06-25 21:26:58 -03:00 |
|
Ezequiel Bergamaschi
|
2166dd9504
|
Merge remote-tracking branch 'origin/develop' into feature/remove_mootols
|
2014-06-19 00:49:34 -03:00 |
|
Ezequiel Bergamaschi
|
425ac4a7ad
|
fix alias checking for jetty 9.x
|
2014-06-19 00:43:10 -03:00 |
|
Michael Magill
|
d3b1c9087f
|
I was getting a 404 because it was looking for en_us, not just en. The en template may need to be copied for other English locales like en_GB, en_CA, etc. The 404 only showed up in Firefox's developer console did not appear to affect functionality, so this is just cleanup.
|
2014-04-29 15:42:31 +00:00 |
|
Paulo Gustavo Veiga
|
634cd3e8be
|
Mir fix on label.
|
2014-04-26 21:08:13 -03:00 |
|
Paulo Gustavo Veiga
|
d1a5bd56f9
|
Merged feature/WISE-211-iconSupportOnLabels into develop
|
2014-04-26 15:44:36 -03:00 |
|
Michael Magill
|
1bfbd8ea60
|
removed "ou=" from LDAP user search since it is now integrated with security.ldap.subDn
|
2014-04-25 20:41:50 +00:00 |
|
Michael Magill
|
c46f65e23f
|
changed default security.ldap.subDn parameter to include "ou="
|
2014-04-25 20:36:48 +00:00 |
|
Michael Magill
|
abd39b604f
|
removed extra / from site.baseurl
|
2014-04-25 20:30:18 +00:00 |
|
Ezequiel Bergamaschi
|
10ff33be13
|
fixing wrong reference variable
|
2014-04-19 14:18:35 -03:00 |
|
Paulo Gustavo Veiga
|
1f61a40e5c
|
Update ads codes.
|
2014-04-18 19:48:09 -03:00 |
|
Paulo Gustavo Veiga
|
fccbf7b996
|
Update analitics tracking code.
|
2014-04-18 19:13:55 -03:00 |
|
Ezequiel Bergamaschi
|
7ea9da3512
|
popovers for icons in label icon chooser
|
2014-04-17 01:29:44 -03:00 |
|
Claudio Barril
|
8b679bae00
|
fixing tests broken because refactor of label attribute icon
|
2014-04-16 10:29:36 -03:00 |
|
Claudio Barril
|
96068e05d4
|
label icon list reduced
|
2014-04-16 03:00:00 -03:00 |
|
Claudio Barril
|
ff327c5b5c
|
jsp include for label icon list
|
2014-04-16 02:59:33 -03:00 |
|
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 |
|
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
|
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 |
|
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
|
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 |
|