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

1287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Drasko DRASKOVIC
4c013fac6f Update README.md 2016-04-28 22:07:16 +02:00
Drasko DRASKOVIC
d950002593 Refractored in Microservices 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2016-04-28 21:49:54 +02:00
Drasko DRASKOVIC
0dca37b656 Correct Gulpfile 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2016-04-27 23:12:31 +02:00
Drasko DRASKOVIC
cf17b53bb6 Add MQTT, HTTP and WS API servers 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2016-04-27 23:05:42 +02:00
Drasko DRASKOVIC
8fee81d8bc Move config.js in root dir, add MQTT and HTTP conf 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2016-04-27 23:05:42 +02:00
Drasko DRASKOVIC
eff9fd2411 Add NATS broker client 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2016-04-27 23:05:42 +02:00
Drasko DRASKOVIC
396727b4d5 Add MQTT and WS server 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2016-04-27 23:05:42 +02:00
Nikola Marcetic
2fb79f1a19 --Readme changed 2016-04-22 10:59:42 +02:00
Drasko DRASKOVIC
7d332297fc Change compostion ports 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2016-04-20 21:00:38 +02:00
Drasko DRASKOVIC
bb0ead885f Make app port more configurable 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2016-04-20 20:58:41 +02:00
Drasko DRASKOVIC
00c6cb77c6 Revert "Move back to mongoose. Remove JWT." 
This reverts commit 129e911652dee3ac75f1ba6e39fe7d723ec039e9.

Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2016-04-20 20:28:39 +02:00
Drasko DRASKOVIC
021427431a Correct Docker files 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2016-04-20 00:20:57 +02:00
Drasko DRASKOVIC
129e911652 Move back to mongoose. Remove JWT. 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2016-04-19 23:14:28 +02:00
Drasko DRASKOVIC
41c1bc03b4 Update README.md 2016-02-15 20:06:54 +01:00
Drasko DRASKOVIC
88405089f6 Update README.md 2016-02-15 01:12:00 +01:00
Drasko DRASKOVIC
9e8888fdff Merge pull request #41 from drasko/master 
Correct GET on single device
 2015-12-08 02:44:50 +01:00
Drasko DRASKOVIC
bd16fa2616 Correct GET on single device 
Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-12-08 02:39:16 +01:00
Drasko DRASKOVIC
8eee6f1bcf Merge pull request #40 from drasko/master 
Update README.md
 2015-12-07 01:33:12 +01:00
Drasko DRASKOVIC
fbb527b435 Update README.md 2015-12-07 01:29:56 +01:00
Drasko DRASKOVIC
b046ce5dd7 Merge pull request #39 from drasko/master 
Update README.md
 2015-12-07 01:19:44 +01:00
Drasko DRASKOVIC
08c3bac64e Update README.md 2015-12-07 01:03:28 +01:00
Drasko DRASKOVIC
f88a913333 Merge pull request #38 from drasko/master 
Correct Docker stuff
 2015-12-07 00:34:35 +01:00
Drasko DRASKOVIC
ef00dac107 Correct Docker stuff 
This commit corrects docker-compose.

Signed-off-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 2015-12-07 00:27:52 +01:00
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