Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,367 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

460 Commits

Author SHA1 Message Date
Jan Steemann 2c934cf1aa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
 2014-06-02 09:52:05 +02:00
gschwab efd057f021 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-02 09:43:57 +02:00
gschwab 0169a4817d error handling 2014-06-02 09:43:55 +02:00
Frank Celler 8db4667755 cleanup of version-check, added option check-version 2014-06-01 13:37:21 +02:00
Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/VocBase/document-collection.h
 2014-05-30 12:51:20 +02:00
gschwab 1fc4060899 edgeCollection may only be used in equal edge definitions 2014-05-28 15:45:03 +02:00
Max Neunhoeffer 0dab3706c5 Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:27:57 +02:00
Max Neunhoeffer dbd973164b Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:24:29 +02:00
Jan Steemann 168fdcf6ef Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	UnitTests/Basics/bson-test.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Basics/BsonHelper.h
 2014-05-19 11:21:58 +02:00
Jan Steemann 0ca849efb9 emit buffer to prevent very big string allocations/reallocations 2014-05-17 00:12:32 +02:00
Jan Steemann a0ffb65b88 emit output of print function to prevent buffering of super-long strings 2014-05-16 20:11:31 +02:00
Jan Steemann 658294ecb3 fixed file with conflicts 2014-05-12 17:22:09 +02:00
Jan Steemann 027ec2d3f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/V8Server/V8PeriodicTask.cpp
	arangod/V8Server/V8PeriodicTask.h
	arangod/V8Server/v8-actions.cpp
	js/common/bootstrap/module-internal.js
	js/server/server.js
	lib/Dispatcher/ApplicationDispatcher.cpp
	lib/Dispatcher/RequeueTask.cpp
	lib/GeneralServer/GeneralListenTask.h
	lib/Scheduler/ApplicationScheduler.cpp
	lib/Scheduler/PeriodicTask.cpp
	lib/Scheduler/Scheduler.cpp
	lib/Scheduler/Scheduler.h
	lib/Scheduler/Task.cpp
	lib/Scheduler/Task.h
	lib/Scheduler/TimerTask.cpp
	lib/Scheduler/TimerTask.h
 2014-05-12 16:49:20 +02:00
Jan Steemann d23fe23254 added tasks manual entry 2014-05-10 02:25:59 +02:00
Jan Steemann 548a79ac4d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-10 00:43:40 +02:00
Jan Steemann cfc2d407d7 added tests for task management 2014-05-10 00:43:14 +02:00
Max Neunhoeffer 8ce1b08183 Add a ClusterMethod to truncate a collection in a cluster. 2014-05-09 23:14:41 +02:00
Jan Steemann 3becebf488 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-09 17:36:42 +02:00
Jan Steemann 82595ee169 improved periodic task management 2014-05-09 17:36:24 +02:00
Frank Celler c2d57c7909 added applicationContext and foxxFilename 2014-05-09 17:12:55 +02:00
Frank Celler 327d669741 fixed safeJoin (missing join) 2014-05-09 17:10:30 +02:00
Jan Steemann c843a12149 jshund 2014-05-09 00:42:18 +02:00
Jan Steemann 20292af75c throw different type of debug error to prevent bogus "out-of-memory" errors 2014-05-08 23:00:18 +02:00
Jan Steemann 8fa45ca181 added string task ids for periodic jobs 2014-05-08 22:59:36 +02:00
Jan Steemann 7f9446f6bc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-07 18:48:44 +02:00
Jan Steemann 7d28a03782 added AQL date functions 2014-05-07 18:17:46 +02:00
Max Neunhoeffer a312d496a9 Finish server functionality for cluster dump. 2014-05-07 16:36:47 +02:00
Jan Steemann 02a532a122 added CURRENT_USER function for AQL 2014-05-02 12:00:39 +02:00
Frank Celler 8e9ad58f3b added cancelation of asnyc jobs 
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Rest/Handler.h
 2014-04-16 20:16:22 +02:00
Jan Steemann 2050049b06 added periodic job management 
this adds functions internal.deletePeriod() and internal.getPeriodic()
functions internal.definePeriodic() now also has an extra parameter to
specify the name of a periodic job. this makes it more easy to tell
jobs apart in the result of internal.getPeriodic().
 2014-04-13 22:19:46 +02:00
Jan Steemann 90c0d0dfd6 added periodic job management 
this adds functions internal.deletePeriod() and internal.getPeriodic()
functions internal.definePeriodic() now also has an extra parameter to
specify the name of a periodic job. this makes it more easy to tell
jobs apart in the result of internal.getPeriodic().
 2014-04-11 21:33:41 +02:00
Jan Steemann c29cf874b5 transaction interface 2014-04-08 14:40:09 +02:00
Jan Steemann 55f0dc5739 logfile opening/closing fixes 2014-03-28 16:45:06 +01:00
Frank Celler d34832bbcf added changePassword attribute for users 2014-03-25 11:40:13 +01:00
Frank Celler 11fb42e722 removed SYS_TEST_PORT from global namespace 2014-03-20 23:05:17 +01:00
Frank Celler e25945aaba fixed javascript.execute for coffee-script 2014-03-20 22:51:30 +01:00
Frank Celler e3df90d2c3 coffee script fix 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-03-20 19:36:42 +01:00
Jan Steemann d10258594e issue #772: added diagnostic output for Foxx application upload 
Conflicts:
	CHANGELOG
 2014-03-14 10:50:38 +01:00
Jan Steemann f7a9023c7c fix error message & number return in arangosh 2014-03-13 22:06:06 +01:00
Jan Steemann 7664d75e6d prevent usage of _useDatabase() in web interface 2014-03-05 13:04:32 +01:00
Jan Steemann 23ba186b0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/CapConstraint/cap-constraint.c
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/frontend/scss/style.scss
	js/common/modules/org/arangodb/users-common.js
 2014-02-25 17:21:14 +01:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +01:00
Jan Steemann 870f969933 added user validation API at POST `/_api/user/<username>` 2014-02-24 11:12:37 +01:00
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
 2014-02-20 21:02:07 +01:00
Frank Celler 38f1e55f99 ignore cache 2014-02-20 20:35:18 +01:00
Frank Celler 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Jan Steemann 9577923c7a fixed jslint warnings 2014-02-20 09:55:51 +01:00
Jan Steemann dc17e63f5a fixed jslint warning 2014-02-19 14:57:08 +01:00
Frank Celler 726144ce39 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
 2014-02-19 14:30:46 +01:00
Frank Celler c779325b5d added frontend-development switch 2014-02-19 14:28:51 +01:00