OrgGo/Mainflux.mainflux
1
0
Fork 0
mirror of https://github.com/mainflux/mainflux.git synced 2025-04-28 13:48:49 +08:00
Code Issues Projects Releases Wiki Activity
164 Commits 1 Branch 0 Tags
Commit Graph

164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Drasko DRASKOVIC
87fa44f9c9 Merge pull request #37 from drasko/master 
Cosmetics
 2015-12-06 19:48:04 +01:00
Drasko DRASKOVIC
7eb4c34ab1 Cosmetics 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-12-06 19:42:27 +01:00
Drasko DRASKOVIC
f3fd689305 Merge pull request #36 from drasko/master 
JWT corrections
 2015-12-06 19:42:13 +01:00
Drasko DRASKOVIC
55b28f90f0 Add JWT data in the signature 
This commit adds Mainflux metadata embedded in JWT.

Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-12-06 14:57:40 +01:00
Drasko DRASKOVIC
40194aeb9b Create logger as a separate file 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-12-06 14:57:40 +01:00
Drasko DRASKOVIC
b930a8f75f Add utils dir and generateToken.js utility 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-12-06 14:57:40 +01:00
Drasko DRASKOVIC
469880a3fa Merge pull request #35 from drasko/master 
Add `bunyan` logger
 2015-12-06 14:54:26 +01:00
Drasko DRASKOVIC
5efcacc731 Add bunyan logger 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-12-05 19:02:49 +01:00
Drasko DRASKOVIC
7382ab9073 Merge pull request #34 from drasko/master 
Swagger file updates
 2015-12-05 19:02:41 +01:00
Drasko DRASKOVIC
0faf6d85c0 Update swagger.yaml 
Add tags
 2015-12-05 01:23:59 +01:00
Drasko DRASKOVIC
e2ab3e19e6 Correct Swagger 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-12-05 01:15:29 +01:00
Drasko DRASKOVIC
980f6ac525 Merge pull request #33 from drasko/master 
Correct Swagger file
 2015-12-04 01:16:44 +01:00
Drasko DRASKOVIC
e7e4da29bb Add jwt 
Devices routes are now JWT protected. We are using `restify-jwt`
which is using `jsonwebtoken` behind.

Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-12-04 00:54:39 +01:00
Drasko DRASKOVIC
54913c7d23 Correct Swagger file 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-12-04 00:54:39 +01:00
Drasko DRASKOVIC
be79cae443 Merge pull request #32 from drasko/master 
Use restify and mongojs. Change structure.
 2015-12-02 22:21:10 +01:00
Drasko DRASKOVIC
59da29ff2b Use restify and mongojs. Change structure. 
This commit introducess massive change:
- Replace Express by Restify for simplicity and lean approach
- Replace Mongoose by MongoJS for DB schema-less paradigm
- Introduce `controllers` dir, and isolate all routes in `routes.js`

Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-12-02 00:17:10 +01:00
Drasko DRASKOVIC
744068bda8 Correct README 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-12-02 00:17:10 +01:00
Nikola
122c02769d Merge pull request #31 from drasko/master 
Launch test with `npm test`
 2015-11-02 10:55:44 +01:00
Drasko DRASKOVIC
276a505eeb Add gulp-exit - gulp exits after finished tests 
Some plugins, like gulp-mocha, have problems with a proper termination
after finishing the task. This plugin guarantees that the task will exit
successfully.

Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-11-02 01:49:39 +01:00
Drasko DRASKOVIC
2e27375adb Add server.close() in apiTest.js 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-11-02 01:49:39 +01:00
Drasko DRASKOVIC
38311af348 Add mongodb in Travis build 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-11-02 01:49:39 +01:00
Drasko DRASKOVIC
455b469bc2 Add gulp locally 
Gulp has to be added both globally and locally for
Travis to work.
Aome explanations:
http://blog.dwaynecrooks.com/post/110903139442/why-do-we-need-to-install-gulp-globally-and

Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-11-02 01:49:39 +01:00
Drasko DRASKOVIC
63281acac5 Add local mocha and fix .travis.yml 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-11-02 01:49:39 +01:00
Drasko DRASKOVIC
253495d5bb Launch test with npm test 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-11-02 01:49:39 +01:00
Drasko DRASKOVIC
66ef92dbf7 Merge pull request #30 from drasko/master 
Add Travis YAML
 2015-11-01 15:54:21 +01:00
Drasko DRASKOVIC
f2fd735dbd Add Travis YAML 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-11-01 15:51:39 +01:00
Drasko DRASKOVIC
4e5edad061 Merge pull request #29 from drasko/master 
Add Mocha, Chai and Supertest combo for testing
 2015-11-01 15:33:52 +01:00
Drasko DRASKOVIC
cb6471790b Add test task in gulp 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-11-01 15:27:49 +01:00
Drasko DRASKOVIC
5e31f45b27 Add Mocha, Chai and Supertest combo for testing 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-11-01 03:43:23 +01:00
Drasko DRASKOVIC
51898276f3 Add Community links 2015-10-17 00:03:21 +02:00
Drasko DRASKOVIC
9f3a728ccb Merge pull request #25 from nmarcetic/master 
-- Hello JWT
 2015-10-13 16:47:58 +02:00
nmarcetic
f36013016e -- Hello JWT 
Signed-off-by: nmarcetic <nikola.marcetic@ntsystems.rs>
 2015-10-13 16:35:32 +02:00
Nikola
b520216351 Merge pull request #21 from drasko/master 
Add license to package.json. Correct HTTP headers.
 2015-10-12 20:48:08 +02:00
Drasko DRASKOVIC
92b4a70528 Correct headers for token. Send full device JSON on creation, update and delete 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-10-11 22:35:05 +02:00
Drasko DRASKOVIC
fafa623680 Add license to package.json 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-10-11 22:35:05 +02:00
Drasko DRASKOVIC
e6203967bb Merge pull request #17 from drasko/master 
Add comments for device model, fix typos
 2015-10-10 01:40:52 +02:00
Drasko DRASKOVIC
3b86bf249c Add comments for device model, fix typos 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-10-10 01:37:50 +02:00
Drasko DRASKOVIC
700a34b589 Merge pull request #16 from drasko/master 
Update README.md
 2015-10-10 01:11:01 +02:00
Drasko DRASKOVIC
a3a2c1f449 Update README.md 2015-10-10 01:06:40 +02:00
Drasko DRASKOVIC
910791c8fa Merge pull request #15 from drasko/master 
Update README.md
 2015-10-10 00:56:17 +02:00
Drasko DRASKOVIC
dd806d2a2e Update README.md 2015-10-10 00:55:04 +02:00
Drasko DRASKOVIC
83e439bb5a Merge pull request #14 from drasko/master 
Switch LICENSE to Apache v2.0
 2015-10-09 23:40:59 +02:00
Drasko DRASKOVIC
45451c8266 Switch LICENSE to Apache v2.0 2015-10-09 23:35:23 +02:00
Drasko DRASKOVIC
47597331f1 Add NodeJS styleguide 2015-10-05 20:07:01 +02:00
Drasko DRASKOVIC
8d914647c8 Corrected typo 2015-10-05 20:04:33 +02:00
Drasko DRASKOVIC
4c7b046824 Merge pull request #13 from drasko/master 
LICENSE, CONTRIBUTING and MAINTAINERS files
 2015-10-04 05:14:16 +02:00
Drasko DRASKOVIC
46498c152f LICENSE, CONTRIBUTING and MAINTAINERS files 
Update MAINTAINERS

Update CONTRIBUTING.md

Update CONTRIBUTING.md

Update CONTRIBUTING.md

Update CONTRIBUTING.md
 2015-10-04 05:10:45 +02:00
Drasko DRASKOVIC
427d03fa0a Update README.md 
Update README.md

Update README.md

Update README.md

Update README.md

Update README.md

Update README.md

Update README.md

Update README.md

Update README.md

Update README.md

Update README.md

Update README.md

Update README.md
 2015-10-03 01:56:02 +02:00
The Gitter Badger
1c9c5e6605 Add Gitter badge 2015-10-03 01:56:02 +02:00
Drasko DRASKOVIC
014d13298a Correct comments 2015-10-03 01:56:02 +02:00