vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-12-27 21:53:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
978 Commits 10 Branches 29 Tags 26 MiB
dbf8b0e28c
Commit Graph

468 Commits

Author SHA1 Message Date
Paulo Gustavo Veiga
27ad9af1b3 Merge branch 'master' of repo.wisemapping.org:wisemapping/wiseorg 2012-03-14 23:01:52 -03:00
Paulo Gustavo Veiga
11c77817cd Add support for custom dialogs and extend drag support. 2012-03-14 23:00:59 -03:00
Gonzalo Bellver
071192fcba Add a sibling below (not opposite) for first-level nodes 2012-03-14 17:48:15 -03:00
Tarjei Huse
e5891636b3 Change mousewheel handling so we let the default 
event happen if we are outside the container.
 2012-03-14 20:34:29 +01:00
Paulo Gustavo Veiga
0660c7e8c3 Fix exception on changing central topic shape. 2012-03-08 00:30:27 -03:00
Paulo Gustavo Veiga
0f2af2cb74 Fix Firefox bugs ... 2012-03-08 00:14:35 -03:00
Paulo Gustavo Veiga
7c10b00435 Topic editor can be configured based on the shape type. 2012-03-07 23:53:03 -03:00
Paulo Gustavo Veiga
8a4dee47f2 Add error dialog for map error during loading. 2012-03-07 21:17:19 -03:00
Paulo Gustavo Veiga
4de8eb17ec Implement discard button. 2012-03-07 20:52:09 -03:00
Paulo Gustavo Veiga
ae9f05dd05 Use FX class for delete node events. 2012-03-07 20:35:06 -03:00
Paulo Gustavo Veiga
eb15952785 Fix minor typo... 2012-03-07 17:45:41 -03:00
Paulo Gustavo Veiga
a1f6542264 First steps on icon drag support. 2012-03-07 17:40:46 -03:00
Paulo Gustavo Veiga
24047e02bb Add support for Images on nodes. 2012-03-07 17:40:45 -03:00
Gonzalo Bellver
2b50017971 Fixed editor bugs 2012-03-07 16:26:06 -03:00
Gonzalo Bellver
6506b60977 Fixed branch overlapping bug 2012-03-06 18:01:56 -03:00
Gonzalo Bellver
dc4f47ab7a Solved issue when overlapping a free node to another branch 2012-03-06 15:53:22 -03:00
Paulo Gustavo Veiga
f704e730c9 Minor bug fixing. 2012-02-29 18:52:07 -03:00
Paulo Gustavo Veiga
1fefb929da Fix change shape bug. 2012-02-27 22:49:55 -03:00
Paulo Gustavo Veiga
e67b2ba50b Fix commands calling super class constructor. 2012-02-27 19:25:14 -03:00
Paulo Gustavo Veiga
58f1f741b0 Remove unused methods. 2012-02-27 19:06:00 -03:00
Paulo Gustavo Veiga
7ba0e36cb9 Introduce the convept of Feature to a topic. 2012-02-27 18:49:58 -03:00
Paulo Gustavo Veiga
9e44804314 Move persistence clases to persistence package. 2012-02-25 23:34:57 -03:00
Paulo Gustavo Veiga
1256d0e218 Fix ctrl issue during node edition. 2012-02-21 18:26:00 -03:00
Paulo Gustavo Veiga
7b6cae0fd2 - Add missing changes. 2012-02-21 15:37:15 -03:00
Paulo Gustavo Veiga
fb3f9946ae Update to HSQLDB driver 
Remove DWR
Remove native SVG tables
Add new REST services for persistence.
 2012-02-21 14:22:43 -03:00
Paulo Gustavo Veiga
ae43a27dd2 All the resources of the editor asume that the resources css,js and images are relative to /. The base parameter could be used to change the default location. 2012-02-20 11:32:37 -03:00
Paulo Gustavo Veiga
e033e8552c Add support for menu base dir configuration. 2012-02-19 18:05:33 -03:00
Paulo Gustavo Veiga
5fd6ba30f5 - Migrate to Spring 3.1 
- Remove Acegy
- Fix editor partially
 2012-02-12 02:55:42 -03:00
Gonzalo Bellver
bf212e649a Fixed node insert bug 2012-02-06 11:12:27 -03:00
Paulo Veiga
edf04d558d Remove duplicated libraries. Manage all as symlinks. 2012-02-04 13:12:54 -03:00
Paulo Veiga
6f7567abea More refactors. 2012-02-04 12:51:50 -03:00
Paulo Veiga
0101ec2ae7 New steps on page customization. 2012-02-03 22:28:00 -03:00
Paulo Veiga
8db3e88ad9 Working on samples. 2012-02-02 13:30:31 -03:00
Paulo Veiga
b6dd7712f9 Keep cleaning and refactoring styles and samples. 2012-02-02 13:30:31 -03:00
Paulo Veiga
b37ecd8c2c Finish embedded view implementation. 2012-02-02 13:30:30 -03:00
Gonzalo Bellver
4391afdf7b Fixed bug for free positioning of balanced sorted nodes 2012-02-02 12:58:25 -03:00
Gonzalo Bellver
7c3ffebc84 Fixed bug for predict in free positioning 2012-02-02 12:41:53 -03:00
Gonzalo Bellver
a0b838a7a6 Added support for predict when dragging a symmetric sorted node 2012-02-02 12:15:59 -03:00
Gonzalo Bellver
d632a079b1 Added support for prediction when dragging a node 2012-02-02 11:30:12 -03:00
Gonzalo Bellver
cb23c48740 predict method refactored: it now includes the node for the prediction 2012-02-01 12:15:19 -03:00
Gonzalo Bellver
23f3ef71bb Added test for BalancedTestSuite 2012-02-01 10:41:22 -03:00
Paulo Veiga
69b36bed75 Rename wise-doc to wise-editor. 2012-01-30 23:33:05 -03:00
Paulo Veiga
00ca42f7fe Remove layout harcodes. 2012-01-30 20:17:47 -03:00
Gonzalo Bellver
306133cd5e Fixed bug for free positioning of balance sorted nodes 2012-01-26 17:20:48 -03:00
Gonzalo Bellver
015703d5b8 Fixed bug where free positioning could cause sibling overlapping 2012-01-26 15:52:32 -03:00
Gonzalo Bellver
9ada52d720 Free Position tests asserted 2012-01-26 13:07:45 -03:00
Gonzalo Bellver
402226afbc Free position layout fixes 2012-01-26 11:53:46 -03:00
Gonzalo Bellver
42f2763ec0 Symmetric Sorter Tests asserted 2012-01-25 13:10:09 -03:00
Gonzalo Bellver
c8d178cb3a Balanced Sorter tests asserted 2012-01-25 11:19:48 -03:00
Gonzalo Bellver
483b889d6a Basic tests asserted 2012-01-24 18:01:56 -03:00
Gonzalo Bellver
4dad2f1a04 layout.html fix 2012-01-24 15:50:17 -03:00
Gonzalo Bellver
b741851f54 Test Suite refactor 2012-01-24 15:48:25 -03:00
Paulo Veiga
db645859ae Fix some keyboard problems with modifiers. 2012-01-21 18:24:55 -03:00
Paulo Veiga
0e07e28b4c Add migrator for Pela to Tango 2012-01-21 18:02:38 -03:00
Paulo Veiga
7ec7c18524 Serialize node text with CDATA. 2012-01-21 16:37:13 -03:00
Paulo Veiga
99146de711 Fix double line issue. 2012-01-21 15:47:21 -03:00
Paulo Veiga
6ed1c1a0b0 Fix wrong connection line between lines and topics. 2012-01-21 15:30:39 -03:00
Paulo Veiga
b9638b4c99 Integrate free positioning predict on drag. 2012-01-21 10:57:15 -03:00
Paulo Veiga
d8e05d7ce0 Improve drag. This should solve the drag bug ... 2012-01-21 10:26:58 -03:00
Paulo Veiga
9748711011 Revert "Reverted unstable changes from db74c6394392fd5c03362de1d98a0c4d2880d103" 
This reverts commit c7dcf9faf8.

Conflicts:

	mindplot/src/main/javascript/DragPivot.js
 2012-01-21 09:37:01 -03:00
Gonzalo Bellver
ba66d6b60f DragPivot visibility hidden 2012-01-20 11:35:10 -03:00
Gonzalo Bellver
c7dcf9faf8 Reverted unstable changes from db74c63943 2012-01-20 11:07:44 -03:00
Gonzalo Bellver
e98d7f8147 Fixed bug with BalancedSorter's predict 2012-01-19 12:20:43 -03:00
Paulo Veiga
419d2ffe79 Merge branch 'master' of ssh://wisemapping.com/var/git-repos/wise-source 2012-01-19 02:38:48 -03:00
Paulo Veiga
db74c63943 Drag pivot is not displayed when a node is clicked. Only when the first drag start. 2012-01-19 02:36:46 -03:00
Gonzalo Bellver
62b3bf8bc0 Fixed node size change bug 2012-01-18 20:02:15 -03:00
Gonzalo Bellver
830f65caa9 Reconnect free node 2012-01-18 19:15:01 -03:00
Gonzalo Bellver
c80726e1c0 Predict for free positioning. 2012-01-18 16:07:40 -03:00
Gonzalo Bellver
c6fa09ec7d Fixed bug where adding a new node borke free positioning 2012-01-18 13:34:30 -03:00
Gonzalo Bellver
069c39df6b Tests fix 2012-01-18 11:10:12 -03:00
Paulo Veiga
2e49219fb9 Free positioning working ... 2012-01-18 01:37:53 -03:00
Paulo Veiga
f0eb293211 Add Free position integration... 2012-01-18 01:26:39 -03:00
Gonzalo Bellver
aa169f5f49 Merge fix 2012-01-17 17:57:27 -03:00
Gonzalo Bellver
1607de9f7d Further testing 2012-01-17 17:54:22 -03:00
Gonzalo Bellver
61eca9f932 Free positioning 2012-01-17 17:54:22 -03:00
Gonzalo Bellver
ea89dff202 Size test improved 2012-01-17 17:54:22 -03:00
Gonzalo Bellver
3f83bf95ea Collision checking implemented 2012-01-17 17:54:22 -03:00
Paulo Veiga
039b5d8c8a - Fix pivot issues. 2012-01-17 00:51:13 -03:00
Paulo Veiga
e5beb4f034 Fix collapse. 2012-01-17 00:26:29 -03:00
Gonzalo Bellver
171c3aee8f Free positioning started. Nodes can move freely, but collisions might occurr 2012-01-15 18:08:31 -03:00
Gonzalo Bellver
75af2aac87 Root nodes support any position 2012-01-15 15:41:03 -03:00
Gonzalo Bellver
3eea7b9e88 Minor fix to TestSuite 2012-01-14 17:19:33 -03:00
Paulo Veiga
c7ddfd6135 nlayout refactor. 2012-01-14 14:20:59 -03:00
Paulo Veiga
90644c201a - Remove all old layout classes. 
- Rename nloyout to layout
- Drag integrated.
 2012-01-14 14:16:59 -03:00
Paulo Veiga
1b3ad1b42d Add new Tango serializer. Pending to comple migration. 2012-01-14 10:45:39 -03:00
Paulo Veiga
89060af08b Integrate predict ... 2012-01-14 09:58:06 -03:00
Gonzalo Bellver
b9e5469907 Nodes of any size now supported 2012-01-13 20:06:14 -03:00
Gonzalo Bellver
78c1de5c67 Predict functions now support null position 2012-01-13 16:26:37 -03:00
Gonzalo Bellver
2bb68de4f1 BalancedSorter predict and verify 2012-01-13 12:37:33 -03:00
Gonzalo Bellver
af6358259a Predict for Symmetric Sorter 2012-01-12 19:58:18 -03:00
Gonzalo Bellver
b8e8038b39 Asserts added to tests 2012-01-12 17:54:18 -03:00
Gonzalo Bellver
cf9bdee1c4 Disconnect node in layout 2012-01-12 15:52:07 -03:00
Paulo Veiga
eca97f6a72 Working on drag.. 2012-01-12 13:44:35 -03:00
Paulo Veiga
aee1dfbff9 Minor fixes for supporting shrink. 2012-01-12 01:37:26 -03:00
Paulo Veiga
ef2902d724 Add support for shink on collapsed nodes. 2012-01-11 23:30:26 -03:00
Paulo Veiga
51bc3e563a Keyboard actions for adding is working with the new layout... 2012-01-11 21:12:22 -03:00
Paulo Veiga
d9cdcc5160 Set position integrated ! 2012-01-11 19:47:00 -03:00
Paulo Veiga
8cf9e6d18e First editor integration. 2012-01-11 18:41:52 -03:00
Gonzalo Bellver
d7817a6f2c Sorter refactoring 2012-01-10 20:01:36 -03:00
Gonzalo Bellver
765162d2a5 Siblings correctly sorted by order 2012-01-10 19:35:52 -03:00
Gonzalo Bellver
a98f8a898a Renamed SymetricSorter->SymmetricSorter 2012-01-10 19:01:16 -03:00
Gonzalo Bellver
63876ccb38 Node sizes for tests made more realistic 2012-01-10 10:01:31 -03:00
Gonzalo Bellver
f3d4c3cd5d Symmetric Sorter adapted to work on both directions 2012-01-10 10:01:30 -03:00
Gonzalo Bellver
f355c5a23a Balanced Layout first level approach 2012-01-10 10:01:29 -03:00
Paulo Veiga
86e80e324c Start integration with new layout. 2012-01-09 23:50:52 -03:00
Gonzalo Bellver
ad1bb136fd Improved test graphs 2012-01-04 14:37:58 -03:00
Gonzalo Bellver
344573d4bd Comment fix 2012-01-02 17:38:44 -03:00
Gonzalo Bellver
93cf061f4c Merge fix 2012-01-02 17:38:02 -03:00
Gonzalo Bellver
3435bd17c2 Merge branch 'master' of ssh://wisemapping.com/var/git-repos/wise-source 2012-01-02 17:10:47 -03:00
Gonzalo Bellver
93e035bbbb Grid sorter first approach 2012-01-02 17:10:14 -03:00
Paulo Veiga
44a46c8489 Merge branch 'master' of ssh://wisemapping.com/var/git-repos/wise-source 
Conflicts:
	mindplot/src/main/javascript/nlayout/TestSuite.js
 2011-12-31 15:08:56 -03:00
Paulo Veiga
8062a29323 - Exclude brix during export 
- More changes for layout manager.
 2011-12-31 14:52:13 -03:00
Gonzalo Bellver
14cb5b586e Visual representation of nodes. Symetric sorter updated 2011-12-30 17:48:11 -03:00
Gonzalo Bellver
9ed6df2158 Basic plotting using Raphael 2011-12-30 15:28:03 -03:00
Paulo Veiga
4644240291 Missing file. 2011-12-11 23:48:29 -03:00
Paulo Veiga
87e636f29a Merge branch 'master' of ssh://wisemapping.com/var/git-repos/wise-source 2011-12-11 23:47:50 -03:00
Paulo Veiga
c2748f67cf More operations supported. 2011-12-11 23:47:01 -03:00
Paulo Veiga
9c41f0719c Close the first prototype of the new layout 2011-12-11 13:13:43 -03:00
Gonzalo Bellver
d20a4bfcea Merge branch 'master' of ssh://wisemapping.com/var/git-repos/wise-source 2011-12-02 14:08:28 -03:00
Gonzalo Bellver
b612472563 Thinkmapping menu removed 2011-12-02 14:07:23 -03:00
Paulo Veiga
a482c410a2 Merge branch 'master' of ssh://wisemapping.com/var/git-repos/wise-source 2011-12-01 18:08:17 -03:00
Paulo Veiga
d62d4af766 Move layout files in order to reflethe final layout structure. 2011-12-01 18:07:19 -03:00
Gonzalo Bellver
6d81803047 Menu refactor cont. toolbar.jsp -> toolbar.jsf 2011-11-30 20:07:50 -03:00
Gonzalo Bellver
5ffce2bbc3 Thinkmapping Menu 2011-11-30 18:17:19 -03:00
Gonzalo Bellver
a300899673 Menu refactor 2011-11-30 18:06:45 -03:00
Paulo Veiga
4d3baac09d - Fix actions over the central topic. 2011-11-30 00:59:36 -03:00
Paulo Veiga
dfc3bbdbe6 - Fix errors on actions over central topic. 2011-11-30 00:56:21 -03:00
Paulo Veiga
e520d9baba - Partially fix relationship to central topic. 
- Fix add icon to the central topic
 2011-11-30 00:50:46 -03:00
Paulo Veiga
bc87d0f311 - Fix Link node 
- Finish local storage support
 2011-11-30 00:32:24 -03:00
Paulo Gustavo Veiga
334206ab19 - Fix meta/control seleccion 2011-11-29 00:51:38 -03:00
Paulo Veiga
81f9ffa5e9 - Fix auto save. 
- Fix error trying to remove a node that contains a icons
- Fix auto-save leaving the page.
 2011-11-29 00:38:11 -03:00
Paulo Veiga
c598c1837e - Fix notes issues. Now, notes are part of a CDATA seccion 2011-11-28 22:38:22 -03:00
Paulo Veiga
a33daf4563 Implement LocalStorage manager ... 2011-11-28 22:17:55 -03:00
Paulo Veiga
410d3553b1 Decouple persistence manager from Designer. 2011-11-28 21:27:57 -03:00
Paulo Veiga
3eeb9e32b9 Add fist version of notifier. More work pending ... 2011-11-28 17:11:02 -03:00
Paulo Veiga
2441b78684 Remove duplicated css. 2011-11-28 14:40:16 -03:00
Paulo Veiga
2bdd9f3a5e Add new icons for weather. It could be useful. 2011-11-27 22:00:46 -03:00
Paulo Veiga
5fc6c19ef4 Minor fix. 2011-11-27 21:39:49 -03:00
Paulo Veiga
0b6fcdb980 Fix failing using tests. Legacy will contain a set of images to be removed in the future. 2011-11-27 21:37:20 -03:00
Paulo Veiga
30de8b44ed - Fix notes issues. Now, notes are part of a CDATA seccion 2011-11-27 20:55:52 -03:00
Gonzalo Bellver
0ac513ea1e Added version numbers where missing from Maven 3 compatibility 2011-11-24 14:57:28 -03:00
Paulo Veiga
a0e13ad9d3 - Add UI cache for position. 2011-11-13 21:18:34 -03:00
Paulo Veiga
cfda92195a Simple bug fixing. 2011-10-27 21:18:49 -03:00
Paulo Veiga
cb7b3a2660 More features. 2011-10-18 23:37:22 -03:00
Paulo Veiga
ce52e078b5 Fix Printer ... 2011-10-18 09:29:29 -03:00
Paulo Veiga
8913b5f187 Add support for modal dialog multiple request. 2011-10-17 10:12:27 -03:00
Paulo Veiga
0133f127b8 Fix embedded view. 2011-10-16 21:42:02 -03:00
Paulo Veiga
cb6302bf50 More more more fixes. 2011-10-15 13:23:27 -03:00
Paulo Veiga
024585c321 More more fixes. 2011-10-15 02:52:44 -03:00
Paulo Veiga
2a37f2e422 Editor working . 2011-10-14 22:56:20 -03:00
Paulo Veiga
64bebe8d88 Fix connection issues. 2011-10-10 19:31:10 -03:00
Paulo Veiga
cd85390b22 Working on the new editor ... 2011-10-10 18:30:02 -03:00
Paulo Veiga
2f9b53b045 Fix icon pannel selection. 2011-10-10 01:23:22 -03:00
Paulo Veiga
c2670d5140 Several issues fixed. 2011-10-09 18:38:41 -03:00
Paulo Veiga
707e1864ef Minor fixes. 2011-10-09 18:14:28 -03:00
Paulo Veiga
a10001dd80 Relationships almost working 2011-10-09 17:59:16 -03:00
Paulo Veiga
5d1ab3cb6e Fix add links. 2011-10-08 20:36:47 -03:00
Paulo Veiga
52587c0eaa Minor fix. 2011-10-07 01:30:55 -03:00
Paulo Veiga
c472b95b20 Minor fix. 2011-10-07 00:50:07 -03:00
Paulo Veiga
7194269826 Finish Notes Support... 2011-10-07 00:21:49 -03:00
Paulo Veiga
1f02d51434 Improve node editor 2011-10-05 02:38:43 -03:00
Paulo Veiga
b0e5923fec Minor fix. 2011-10-04 23:59:21 -03:00
Paulo Veiga
9185883d30 Implements toolbar disabling. 2011-10-04 01:16:29 -03:00
Paulo Veiga
b7bbe2c0b7 Fix toolbar. 2011-10-02 21:05:17 -03:00
Paulo Veiga
410180e744 Remove bunch of duplicated code. 2011-10-02 20:16:57 -03:00
Paulo Veiga
0f990f1c63 Fix color pallete. 2011-10-02 19:16:13 -03:00
Paulo Veiga
f3af50740c Save action working again :). 2011-10-02 14:47:54 -03:00
Paulo Veiga
a994099397 Merge WiseDoc with Master. WiseDoc branch must not be used. 2011-10-02 12:22:09 -03:00
Paulo Veiga
304f9f4c97 Support connection in any node. 2011-09-14 08:51:38 -03:00
Paulo Veiga
5a08728686 Add remove node support. 2011-09-11 00:07:43 -03:00
Paulo Veiga
c1e0d52ff5 More fixes. 2011-09-10 01:17:48 -03:00
Paulo Veiga
1abda3914a Support multiple nodes .. 2011-09-09 22:26:52 -03:00
Paulo Veiga
09237a13b5 Fix several issues. 2011-09-09 22:03:31 -03:00
Paulo Veiga
d84384364c Fix several issues. 2011-09-09 21:53:41 -03:00
Paulo Veiga
2a4d96151b Keep fixing issues. 2011-09-09 02:22:44 -03:00
Paulo Veiga
0c216778e5 Add IMindmap and INode. 2011-09-08 10:03:42 -03:00
Paulo Veiga
21f848e3df Refactor and create INode and IMindmap 2011-09-08 10:02:55 -03:00
Paulo Veiga
71b761081f New model. 2011-09-08 09:54:55 -03:00
Paulo Veiga
bd305fa14e Refactor loader. 2011-09-08 09:16:50 -03:00
Paulo Veiga
6871f88cbb Minor fix. 2011-09-08 09:10:05 -03:00
Paulo Veiga
dbed45c802 Fix error on brix framework loading ... 2011-09-06 22:12:11 -03:00
Paulo Veiga
6468f6f0bc Rename framework module. 2011-09-06 10:01:48 -03:00
Paulo Veiga
1b2c7b1ce2 Minor fix. 2011-09-06 01:10:43 -03:00
Paulo Veiga
e2da27ebc8 Basic topic propeties integrated with brix. 2011-09-06 01:03:27 -03:00
Paulo Veiga
85defa2ab9 Minor improvement. 2011-09-05 09:28:06 -03:00
Paulo Veiga
12221ab0af Minor fix to position cursor. 2011-09-05 09:25:38 -03:00
Paulo Veiga
0e21aad802 Severa lfixed. 2011-09-04 21:32:29 -03:00
Paulo Veiga
dbb2b2d0c9 Minor fixes. 2011-09-04 15:26:42 -03:00
Paulo Veiga
cc9bf1b908 Multiline working :) 2011-09-04 03:28:09 -03:00
Paulo Veiga
b1b0ee0de8 Resize icons on scale. 2011-09-02 20:05:51 -03:00
Paulo Veiga
001ff2e371 Add icon to padding. 2011-09-02 18:25:34 -03:00
Paulo Veiga
ba1a724df6 Fix icon removal. Notes pending. 
- Update icon size
 2011-09-02 13:59:08 -03:00
Paulo Veiga
d43eb930d9 Partially supported multilines. 2011-09-02 02:31:03 -03:00
Paulo Veiga
e437e0e329 Refactor Web2D to use mootool classes. 2011-08-30 14:21:55 -03:00
Paulo Veiga
55db305b10 Fix remove icon. 2011-08-29 20:32:12 -03:00
Paulo Veiga
c74d2de32d Fix flicker. 
Remove more code.
 2011-08-29 20:10:05 -03:00
Paulo Veiga
dc50cee16d Remove more custom code in favor of mootols. 2011-08-28 11:58:43 -03:00
Paulo Veiga
d20e5cf6d5 Replace owr mouse function for a mootool one. 2011-08-28 11:38:15 -03:00
Paulo Veiga
c2521f0f9f Fix center properly ... 2011-08-28 11:13:45 -03:00
Paulo Veiga
26759bd437 Fix resize issue. Need to work on centering the node. 2011-08-26 19:41:50 -03:00