1
0
Fork 0
Commit Graph

2088 Commits

Author SHA1 Message Date
Jan Steemann d37b21375b attempt to fix travis build 2013-09-05 14:51:15 +02:00
Jan Steemann b9fbbc85ea Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-05 12:43:17 +02:00
Jan Steemann 369433f1e2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/SimpleHttpClient/SimpleHttpClient.cpp
2013-09-05 12:34:45 +02:00
Frank Celler bbab760a54 renamed foxx-manager to foxx/manager 2013-09-05 10:02:31 +02:00
Lucas Dohmen 4f283d39f4 Foxx: Controller#register 2013-09-04 18:06:52 +02:00
Jan Steemann ca2f5feb4b fixed redirect URLs 2013-09-04 17:30:37 +02:00
Jan Steemann 3a4532cd71 fixed jslint warnings 2013-09-04 16:07:48 +02:00
Jan Steemann b4efb78f7c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-04 15:58:49 +02:00
Jan Steemann 435e949462 fixed redirections in web interface 2013-09-04 15:58:41 +02:00
Lucas Dohmen 69286b5742 Foxx: Foxx Transformer is now Foxx Preprocessor 2013-09-04 15:08:15 +02:00
Lucas Dohmen f5bbae992c Names 2013-09-04 14:15:25 +02:00
Lucas Dohmen 9c86586014 Var Rage 2013-09-04 14:14:55 +02:00
Lucas Dohmen d946c0fe59 Whitespace Rage 2013-09-04 14:05:41 +02:00
Lucas Dohmen 87c9175db6 Authentication Module – Signs of a Struggle 2013-09-04 13:56:05 +02:00
Lucas Dohmen 610f0ee4cb Pushing stuff down 2013-09-04 13:43:17 +02:00
Lucas Dohmen 34cade4344 Foxx: Pulling some stuff out of the Foxx Controller 2013-09-04 13:32:42 +02:00
Jan Steemann 42660cbb5a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-04 13:04:30 +02:00
Jan Steemann 897412b4de initial dropping of databases 2013-09-04 13:04:13 +02:00
Lucas Dohmen d1f7d25aa8 Foxx: Some refinements for `.login` and `.logout` 2013-09-04 13:01:56 +02:00
Lucas Dohmen d9213af5ec Foxx: Manifest File apps -> controllers [BREAKING CHANGE]
Adjusted to the new vocabulary
2013-09-04 11:12:09 +02:00
Lucas Dohmen 94a151ec2f Adjusted Aardvark to new version of Foxx 2013-09-04 10:51:14 +02:00
Lucas Dohmen afef07b425 Foxx: Foxx.Application is now Foxx.Controller [BREAKING CHANGE]
The naming was confusing, because Foxx Application had two meanings.
Now we are using the terminology used in MVC frameworks.
2013-09-04 10:43:39 +02:00
Lucas Dohmen 95e409763d Foxx: Upgrade Alpha Routes. Fixes #589 2013-09-04 10:24:46 +02:00
Frank Celler 65705428f1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-09-03 21:35:49 +02:00
Frank Celler bde36da436 fixed collection prefix 2013-09-03 21:35:43 +02:00
Heiko Kernbach 12fdc3f711 css 2013-09-03 20:15:57 +02:00
Heiko Kernbach 2d953847af css db 2013-09-03 19:38:21 +02:00
Heiko Kernbach 316d8705cc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-03 19:03:37 +02:00
Heiko Kernbach 885896a323 autoscaling graphs 2013-09-03 19:03:30 +02:00
Lucas Dohmen de3a9c2801 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-09-03 17:51:12 +02:00
Lucas Dohmen d33c3974fd Foxx: onlyIf simplified 2013-09-03 17:50:34 +02:00
Heiko Kernbach 106aa13f5f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-03 16:19:48 +02:00
Heiko Kernbach abc5f87911 css 2013-09-03 16:19:39 +02:00
Lucas Dohmen e0ff2d6266 Foxx: Documentation for the existing auth functionality 2013-09-03 16:18:10 +02:00
Heiko Kernbach e662b810ac css dashboard 2013-09-03 15:19:23 +02:00
Heiko Kernbach 59860fd7dc design 2013-09-03 15:06:21 +02:00
Heiko Kernbach d2436a83f5 frontend design 2013-09-03 14:44:47 +02:00
Heiko Kernbach 5e881c3d54 fixed backbone document model, css changes 2013-09-03 13:42:06 +02:00
Heiko Kernbach 6db1d2d22c css chrome changes 2013-09-03 13:17:01 +02:00
Heiko Kernbach 17356558e3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-03 13:03:43 +02:00
Heiko Kernbach 64fc89b243 css chrome changes 2013-09-03 13:03:31 +02:00
Heiko Kernbach c73246830f dashboard css changes 2013-09-03 12:15:05 +02:00
Lucas Dohmen b0fbdbbabf Admin Interface: Found the bug, smashed it
* A model and a collection were using the same name
* Don't know why it worked before
* Also updated Backbone and Underscore and removed the old versions
2013-09-03 12:11:22 +02:00
Lucas Dohmen f7899bed83 Foxx: Authentication – first version for feedback 2013-09-03 12:11:22 +02:00
Heiko Kernbach 49d2740354 +0.5px for edit icon 2013-09-03 11:18:14 +02:00
Heiko Kernbach f9c69fd542 css 2013-09-03 11:00:52 +02:00
Heiko Kernbach 6649213f48 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-03 10:59:27 +02:00
Jan Steemann bae9f097fc added _dropDatabase() 2013-09-02 18:04:19 +02:00
Jan Steemann 0b3a0e7cc0 added exclusive lock for database creation 2013-09-02 14:50:30 +02:00
Jan Steemann 618499c2b1 adjusted client tools and documentation 2013-09-02 14:07:38 +02:00