vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-29 09:04:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,740 Commits 10 Branches 29 Tags 26 MiB
e80f4f6518
Commit Graph

1740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paulo Gustavo Veiga
9efa963ec8 Fix SQL names. 2014-04-27 11:13:38 -03:00
Paulo Gustavo Veiga
a42811630d Merge branch 'develop' into feature/WISE-211-iconSupportOnLabels 2014-04-26 21:15:57 -03:00
Paulo Gustavo Veiga
d7ca087182 Mir fix on label. 2014-04-26 21:08:13 -03:00
Claudio Barril
d2a99998b5 add update for label icon support with tag as default 2014-04-26 18:27:01 -03:00
Paulo Gustavo Veiga
d6a60636ed Merged feature/WISE-211-iconSupportOnLabels into develop 2014-04-26 15:44:36 -03:00
Paulo Gustavo Veiga
9ca2f6bb1e Merged in ldap-changes (pull request #1) 
move 'ou=' from being hardcoded to part of security.ldap.subDn
 2014-04-26 15:39:29 -03:00
Michael Magill
b886a5888a 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
cec140b1fd changed default security.ldap.subDn parameter to include "ou=" 2014-04-25 20:36:48 +00:00
Michael Magill
84cffac713 removed extra / from site.baseurl 2014-04-25 20:30:18 +00:00
Ezequiel Bergamaschi
52968d435c FloatingTip in ToolbarItem deleted 2014-04-21 00:34:23 -03:00
Ezequiel Bergamaschi
efd8c6e867 fixing some old refs 2014-04-21 00:34:01 -03:00
Ezequiel Bergamaschi
3d2c251b03 FloatingTip as bootstrap popover 2014-04-20 23:57:39 -03:00
Ezequiel Bergamaschi
6a786a46e0 KeyboardShortcutTooltip reimplemented 2014-04-19 16:47:11 -03:00
Mariela Michalek
12a90cc820 add open link functionality 2014-04-19 16:38:04 -03:00
Mariela Michalek
64ec947157 refactor note and link editors 2014-04-19 16:28:28 -03:00
Mariela Michalek
47241c38f3 update remove button 2014-04-19 16:25:28 -03:00
Ezequiel Bergamaschi
754d4b3dcf fixing wrong reference variable 2014-04-19 14:18:35 -03:00
Paulo Gustavo Veiga
7ee577c400 Update ads codes. 2014-04-18 19:48:09 -03:00
Paulo Gustavo Veiga
c854c1b377 Update analitics tracking code. 2014-04-18 19:13:55 -03:00
Mariela Michalek
02b6ea66dd set styles 2014-04-18 17:54:24 -03:00
Mariela Michalek
2f82ce6d54 update editors with remove button 2014-04-18 17:13:44 -03:00
Mariela Michalek
65286f0443 fade in remove button 2014-04-18 17:12:36 -03:00
Ezequiel Bergamaschi
bfe24b7dfb popovers for icons in label icon chooser 2014-04-17 01:29:44 -03:00
Claudio Barril
85c7e3ce5c fixing tests broken because refactor of label attribute icon 2014-04-16 10:29:36 -03:00
Claudio Barril
27304ea385 label icon list reduced 2014-04-16 03:00:00 -03:00
Claudio Barril
8a994ee6f5 jsp include for label icon list 2014-04-16 02:59:33 -03:00
Claudio Barril
5ec3b6cce1 label attribute icon to iconName refactor (because of eze code review) 2014-04-16 02:38:33 -03:00
Claudio Barril
8cd05ec37e adding icon to tags list (when tagging) and some style 2014-04-16 02:25:07 -03:00
Ezequiel Bergamaschi
5a00229390 adding css for color chooser 2014-04-16 01:57:42 -03:00
Ezequiel Bergamaschi
4b01f7c8ee removing fixme from dialogForm function 2014-04-16 01:48:09 -03:00
Claudio Barril
edb91b92bd fix tests 2014-04-16 00:25:32 -03:00
Claudio Barril
c6ae7be255 import label list from another jsp prototype 2014-04-14 18:14:56 -03:00
Claudio Barril
86ba19c120 sending icon data to api rest 2014-04-14 18:14:32 -03:00
Claudio Barril
183ab33729 add styles 2014-04-14 18:10:16 -03:00
Claudio Barril
9e992a8f61 add label icons back-end (model and database) 2014-04-14 18:09:34 -03:00
Claudio Barril
5d18283285 icon ui selection 2014-04-12 19:04:28 -03:00
Claudio Barril
d66666010d icon dropdown creation dialog 2014-04-12 19:04:19 -03:00
Claudio Barril
bddf867b63 icon message 2014-04-12 19:03:31 -03:00
Mariela Michalek
ff9cd9466e update accept button 2014-04-12 15:11:39 -03:00
Mariela Michalek
1416ff2d11 update editor's events 2014-04-12 15:00:51 -03:00
Mariela Michalek
356ccfe115 conflict linkEditor 2014-04-10 19:35:39 -03:00
Mariela Michalek
cb6d691ee2 update bootstrapDialog 2014-04-10 19:33:48 -03:00
Mariela Michalek
66bf71fbc7 update editors 2014-04-10 19:33:20 -03:00
Claudio Barril
d0d161e8ab fix padding and label in two lines 2014-04-09 00:13:38 -03:00
Ezequiel Bergamaschi
0c80f8f544 removing css class 2014-04-06 18:31:28 -03:00
Ezequiel Bergamaschi
a47232d6df removing custom class .btn-primary, keep bootstrap 2014-04-06 18:24:16 -03:00
Ezequiel Bergamaschi
776f2e968d fixing bug 2014-04-03 22:56:11 -03:00
Ezequiel Bergamaschi
5803d46fa6 Merge remote-tracking branch 'origin/feature/remove_mootols' into feature/remove_mootols 
Conflicts:
	mindplot/src/main/javascript/widget/LinkEditor.js
 2014-04-03 22:42:21 -03:00
Ezequiel Bergamaschi
c385603454 BootstrapDialog and fixing LinkEditor 2014-04-03 22:39:23 -03:00
Mariela Michalek
0348662bf6 update link and note editor 2014-04-02 15:57:32 -03:00