Commit Graph

938 Commits

Author SHA1 Message Date
Ezequiel Bergamaschi
0cf62d53d0 Revert "Revert "Revert "new header"""
This reverts commit 9844fb156e.

Conflicts:

	wise-webapp/src/main/webapp/jsp/header.jsp
2014-09-12 17:07:22 -03:00
Ezequiel Bergamaschi
8bdbdae5c9 finishing css bug fixing of custom toolbar items 2014-09-11 16:59:22 -03:00
Ezequiel Bergamaschi
3eca991285 mindmapExport css bug fixing 2014-09-11 15:12:27 -03:00
Ezequiel Bergamaschi
63b8c32d63 trigger event when dialog is shown to perform custom dialog actions 2014-09-11 14:38:49 -03:00
Ezequiel Bergamaschi
9fd5c2c8d4 mindmapShare css improvements 2014-09-11 13:04:50 -03:00
Ezequiel Bergamaschi
903d03fdf4 fixing style stuffs 2014-09-11 11:35:31 -03:00
Claudio Barril
d7ca99a69c really fix share editor (prod bug) 2014-09-09 18:48:51 -03:00
Claudio Barril
3b10674925 fix some issues in share dialog 2014-09-09 17:43:22 -03:00
Claudio Barril
6710fbd9f7 remove duplicates files uploads 2014-09-09 17:42:17 -03:00
Claudio Barril
438bb5a7d6 fix view history of maps 2014-09-09 13:50:17 -03:00
Claudio Barril
9906f46ce6 fix publish panel 2014-09-09 11:19:56 -03:00
Claudio Barril
4581f07daf fix regular expresion in export window 2014-09-09 11:19:20 -03:00
Claudio Barril
69631a11b1 fix content type 2014-09-08 15:51:20 -03:00
Ezequiel Bergamaschi
0cec7c2fec dialogs migration from moodialog to bootstrap 2014-09-08 14:55:34 -03:00
Ezequiel Bergamaschi
0df077d14b mindmap export bug fixing 2014-09-07 20:17:59 -03:00
Ezequiel Bergamaschi
2459a14c9b BootstrapDialog.Request implementation 2014-09-01 02:45:15 -03:00
Ezequiel Bergamaschi
8bfdda82b7 Revert "Revert "new header""
This reverts commit 3d6df8a143.
2014-08-18 21:54:41 -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
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
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