1
0
Fork 0
Commit Graph

384 Commits

Author SHA1 Message Date
Michael Hackstein feb9590a1f Front-End: Added new jquery libs (1.8.3 -> 1.9.1) however they are not loaded due to conflicts with the web shell 2013-03-26 14:35:56 +01:00
Jan Steemann 3bb251000c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	lib/V8/v8-utils.cpp
2013-03-26 14:13:41 +01:00
Jan Steemann 1492118545 added test cases for "fs" module 2013-03-26 14:09:20 +01:00
Michael Hackstein 4d32fb204b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-26 14:01:47 +01:00
Frank Celler a8d9a14e7d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-26 13:58:20 +01:00
Frank Celler 557184631d more fox-manager, added files section 2013-03-26 13:58:00 +01:00
Michael Hackstein 7e8607ffed GraphViewer: Fixed Bug in load Graph by Attribute. Now this works and can be used in demo 2013-03-26 13:56:00 +01:00
Michael Hackstein e2068ece03 Admin Interface: Moved invisibility of Applications to CSS-file 2013-03-26 12:48:43 +01:00
Michael Hackstein 99e8eee458 Fixed Swagger pathes to logos/icons 2013-03-26 10:52:04 +01:00
Michael Hackstein b6b57183b9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-26 10:28:38 +01:00
Michael Hackstein 3952d6c2ce Admin-UI: Added the complete swagger output under applications/swagger 2013-03-26 10:28:27 +01:00
Jan Steemann 95efb14e7f generated file 2013-03-26 10:09:11 +01:00
Frank Celler 0f6e48a38b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/server/modules/org/arangodb/foxx.js
2013-03-26 10:01:39 +01:00
Michael Hackstein 0f473605c0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-26 09:40:37 +01:00
Thomas Richter 0e74ef7911 work in progress 2013-03-26 09:27:24 +01:00
Michael Hackstein 0da98bd95c Removed Mac specific file 2013-03-26 08:05:29 +01:00
Michael Hackstein 7a08751f4e Renamed Aardvark -> Applications which maybe a bit more understandable for outsiders 2013-03-26 08:04:00 +01:00
Michael Hackstein e6dac39032 GraphViewer: Events can now be added to edges during runtime 2013-03-26 07:52:32 +01:00
Michael Hackstein 85420d7172 GraphViewer: Nodes are now correctly reshaped if new events are bound 2013-03-25 20:43:13 +01:00
Michael Hackstein d8c3e7f464 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-25 16:15:15 +01:00
Michael Hackstein 735e891801 Fixed the issue with multiple edit attribute-fields at the same time #456 2013-03-25 16:15:06 +01:00
Jan Steemann e3ed240e89 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-25 15:53:17 +01:00
Jan Steemann 0e6c21e4e7 removed NEW_BORN collection status in server 2013-03-25 15:51:42 +01:00
Michael Hackstein ddf1d261ea Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-25 15:41:08 +01:00
Michael Hackstein e4aceec3e6 Added a helper class to simulate mouse events in test cases, Added a test for redrawing of nodes whenever new events are bound 2013-03-25 15:40:18 +01:00
Jan Steemann 122c60055a issue #461 2013-03-25 15:09:31 +01:00
Michael Hackstein d776b5b8f4 Aardvark is now hidden 2013-03-25 14:55:09 +01:00
Frank Celler 5e473ad6df Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-25 14:10:20 +01:00
Frank Celler 877066392e foxx manager cleanup 2013-03-25 14:10:10 +01:00
Michael Hackstein 202381394e GraphViewer: Events can now be bound to edges 2013-03-25 12:26:45 +01:00
Michael Hackstein 3978441f4c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-25 12:24:16 +01:00
Jan Steemann 60fa94e5b4 fixed errors in arangosh (browser) 2013-03-25 12:00:15 +01:00
Michael Hackstein c518c8dab8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-25 08:30:34 +01:00
Michael Hackstein 45a5d4f79f Added Aarkward views + css + everything to Admin Interface, backend App is still returning fake data 2013-03-24 18:31:14 +01:00
Jan Steemann 9cbd8e4707 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-24 18:13:26 +01:00
Jan Steemann 124d7cb29f fixed file uploads 2013-03-24 18:13:13 +01:00
Michael Hackstein c35126a9ab Added the views for aarkward and swagger 2013-03-24 17:05:11 +01:00
Michael Hackstein f8ada532fd Added buttons for aarkvard and swagger in the navbar 2013-03-24 16:51:36 +01:00
Frank Celler 0a488cd84b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-24 15:03:16 +01:00
Frank Celler e3de563668 requiresLibs and requiresModels 2013-03-24 15:03:01 +01:00
Jan Steemann 071144ecc0 temporary file functons 2013-03-24 14:32:09 +01:00
Jan Steemann f58e1a4b9a sendFile 2013-03-24 11:44:29 +01:00
Frank Celler 0f16938a0b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-24 10:59:00 +01:00
Jan Steemann a118bb19f6 clean up 2013-03-24 10:48:15 +01:00
Frank Celler bc0d1180fb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/client/modules/org/arangodb/foxx.js
	js/common/bootstrap/module-internal.js
2013-03-24 10:45:26 +01:00
Michael Hackstein e05ee003c4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-24 08:38:00 +01:00
Michael Hackstein b4b871bff7 In Documents Overview now the _key values are also clickable. Issue #458 2013-03-24 01:17:13 +01:00
Jan Steemann 2c279d9c4f fixed jslint errors 2013-03-24 01:14:58 +01:00
Jan Steemann 37f364e70e added internal.download() 2013-03-24 01:04:26 +01:00
Michael Hackstein dc7707164c Collection Selection now fires backbone event and no faked link. CollectionNames are now clickable to select the text. Issue #458 2013-03-24 00:42:47 +01:00
Michael Hackstein d23404e1bc Removed debug ooutput 2013-03-24 00:33:49 +01:00
Michael Hackstein fd39c9ffeb Add new Collection is now first Option, Issue #450 2013-03-24 00:08:37 +01:00
Michael Hackstein 78f98a20ab When deleting a docement the Total Number of documents counter is updated correctly Issue #460 2013-03-24 00:03:09 +01:00
Frank Celler 4ccee5fe61 Merge remote-tracking branch 'origin/devel' into devel
Conflicts:
	js/common/modules/org/arangodb/foxx.js
2013-03-23 23:48:48 +01:00
Jan Steemann 91fbb454f3 added zipFile() 2013-03-23 22:32:59 +01:00
Frank Celler 8b0c0c7662 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/common/bootstrap/module-internal.js
2013-03-23 21:58:44 +01:00
Frank Celler 44806229f7 fixed jslint errors 2013-03-23 21:57:33 +01:00
Jan Steemann d97954e466 unzip 2013-03-23 20:52:33 +01:00
Frank Celler 961552b753 added trace for failed conversion 2013-03-23 17:32:32 +01:00
Frank Celler 4059f31170 return error message 2013-03-23 16:42:52 +01:00
Jan Steemann 0d2fdcae58 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	js/common/bootstrap/module-fs.js
2013-03-23 14:36:45 +01:00
Frank Celler 8a54df7419 added .arangosh.rc, added /_admin/execute 2013-03-23 14:04:08 +01:00
Frank Celler a8d5a06f57 added resetEngine 2013-03-22 18:09:01 +01:00
Frank Celler 38a5cf6a2d added development-mode 2013-03-22 17:33:25 +01:00
Heiko Kernbach 291e5bdbb6 fixes #448 2013-03-22 14:31:58 +01:00
Michael Hackstein 60416e671a Deleting nodes now works and redraws the graph, in the demo page deleting has been included 2013-03-21 15:57:36 +01:00
Michael Hackstein a4065dd30d Events can now be rebound during runtime on any object 2013-03-21 15:36:54 +01:00
Michael Hackstein 8aee0d3ed0 Minor fix in GraphViewerSpec, causing user-interaction tests to fail 2013-03-21 13:53:18 +01:00
Michael Hackstein a5df10cb50 Added creation of node to demo.html 2013-03-21 13:03:00 +01:00
Michael Hackstein 3c2f88d6ab Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-21 10:55:12 +01:00
Michael Hackstein 4d7e20a151 GraphViewer and Demo adapted to EventDispatcher 2013-03-21 10:54:57 +01:00
Michael Hackstein 4f163640b8 Finished implementing the EventDispatcher 2013-03-21 10:41:07 +01:00
Jan Steemann 6d9e82dbd3 issue #457 2013-03-20 16:52:53 +01:00
Jan Steemann 4799f3309d fixed ArangoStatement.explain() with bind variables 2013-03-20 16:52:25 +01:00
Michael Hackstein ff14ec670d Fix for return format of ArangoDB, now it is always interpreted as JSON-Object 2013-03-20 14:31:39 +01:00
Michael Hackstein c8b19823d3 Start of event dispatcher implementation 2013-03-20 14:31:02 +01:00
Jan Steemann 45906ad0a9 derived file 2013-03-20 12:12:56 +01:00
Jan Steemann 9519b69db1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-20 11:56:38 +01:00
Jan Steemann 40199d64b7 fixed handling of empty and reserved attribute names in documents
specifying an empty attribute name in a document may have led to segmentation faults
when the document was unpacked later.
2013-03-20 11:48:33 +01:00
Michael Hackstein 0f246a5a28 Moved specs for events into a combined folder 2013-03-20 10:57:18 +01:00
Michael Hackstein 9f8e969699 Improved style of EventLib code 2013-03-20 10:41:53 +01:00
Michael Hackstein a9fc8289b2 EdgeShaper now also uses arangoDBs _id as default id value 2013-03-20 10:33:55 +01:00
Michael Hackstein e755c67a3b fixed test data adapted to mirror arangoDB internal id 2013-03-20 10:11:00 +01:00
Michael Hackstein 7eb123b2c3 Fix in NodeShaper spec 2013-03-20 10:01:48 +01:00
Michael Hackstein eb5b61b6fd NodeShaper now uses arangoDB _id as default, specs adapted 2013-03-20 09:55:26 +01:00
Michael Hackstein d24d315870 added events to create/patch/delete nodes and edges to the event library 2013-03-20 09:43:43 +01:00
Jan Steemann f06d206f6c do not make input rows bigger each row 2013-03-19 16:12:58 +01:00
Jan Steemann a56d99051d fixed auto-growing textareas in document view 2013-03-19 15:47:36 +01:00
Jan Steemann 5405e3bc22 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-19 14:54:00 +01:00
Jan Steemann 281710652c prevent some errors in front end 2013-03-19 14:53:43 +01:00
Michael Hackstein 63da881aab Removed unused debug output 2013-03-19 14:39:57 +01:00
Michael Hackstein 95af25c9ce fixed inconsistent searchbar and inital load error 2013-03-19 14:26:20 +01:00
Jan Steemann 4fc2fe5635 fixed broken route 2013-03-19 14:10:29 +01:00
Jan Steemann 186e04b159 issue #451 2013-03-19 14:04:25 +01:00
Jan Steemann 834706f9e7 fixed typo in labels 2013-03-19 13:56:07 +01:00
Jan Steemann 1a387513da fixed labels, set focus when creating new collection 2013-03-19 13:54:51 +01:00
Jan Steemann 446fc2fc5c issue #447 2013-03-19 13:45:44 +01:00
Jan Steemann 00fbda082d fixed frontend bugs 2013-03-19 13:40:26 +01:00
Michael Hackstein 0ee61aae41 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-19 11:40:53 +01:00
Michael Hackstein bef8d02a95 Fixed bug causing to request centrality over and over again if it is equal to 0 2013-03-19 11:40:30 +01:00