yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,877 Commits 122 Branches 507 Tags
Commit Graph

5877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pierreburgy
f3d3247246 Restrict config access 2015-11-09 17:50:30 +01:00
loicsaintroch
09785da3a7 Fix tests 2015-11-09 15:27:39 +01:00
loicsaintroch
710321e76c Rebuild the dictionary on restart 2015-11-09 15:10:53 +01:00
Loïc Saint-Roch
379677729e Merge pull request #22 from sylvainlap/master 
From passport to grant with purest
 2015-11-09 14:34:44 +01:00
Loïc Saint-Roch
a93db78104 Merge pull request #24 from wistityhq/feature/restart 
Restart the server in development and production
 2015-11-05 16:28:09 +01:00
Aurélien Georget
92a4cea98c Clean guidelines 2015-11-05 15:42:32 +01:00
Aurélien Georget
f233466e01 Improve position log studio server found 2015-11-05 15:39:21 +01:00
Aurélien Georget
9147b4be07 Defer socket events to reduce conflicts with Node process 2015-11-05 15:26:51 +01:00
Loïc Saint-Roch
126b528779 Merge pull request #23 from wistityhq/fix/dashboardToken 
DashboardToken used in headers
 2015-11-05 15:02:01 +01:00
loicsaintroch
c0846fab32 Programmatically restart the server for the Studio 2015-11-05 14:25:36 +01:00
SylvainLap
2ef6a8823a take comments into account 2015-11-04 17:59:43 +01:00
SylvainLap
b6e1d9deb3 remove passport hook 2015-11-04 17:58:26 +01:00
SylvainLap
9359582a8d remove passport, added grant 2015-11-04 17:31:07 +01:00
pierreburgy
a1b6e6eb56 DashboardToken used in headers 2015-11-03 18:46:30 +01:00
loicsaintroch
c30edafb60 Improve error message when load a hook 2015-11-02 15:56:56 +01:00
Pierre BURGY
bb2e488cf9 Merge pull request #21 from wistityhq/improve/moduleloader 
Load config from API and specific environment
 2015-11-02 15:41:25 +01:00
loicsaintroch
ce7789698f Load config from API and specific environment 2015-11-02 14:42:08 +01:00
loicsaintroch
e205382ee9 v1.3.1 v1.3.1 2015-10-30 17:34:00 +01:00
loicsaintroch
0013437fba Bump path generator versions 2015-10-30 17:33:45 +01:00
Loïc Saint-Roch
3e6a739e83 Merge pull request #20 from wistityhq/improve/studio 
Dashboard token logic
 2015-10-30 17:28:55 +01:00
pierreburgy
8bf6ad882e Merge branch 'master' of github.com:wistityhq/strapi into improve/studio 2015-10-30 17:27:24 +01:00
Loïc Saint-Roch
f5d24b7a70 Merge pull request #19 from wistityhq/fix/put 
Fix dashboard update route
 2015-10-30 17:10:19 +01:00
pierreburgy
77f2b4ab4d Fix dashboard update route #18 2015-10-30 17:07:48 +01:00
pierreburgy
aeee53530d Delete dashboardToken field 2015-10-30 16:21:53 +01:00
pierreburgy
6bda3276a8 Remove useless comment 2015-10-30 14:39:47 +01:00
pierreburgy
1296c2da79 Merge branch 'master' of github.com:wistityhq/strapi into improve/studio 2015-10-30 14:38:10 +01:00
pierreburgy
21917d930f Merge branch 'improve/studio' of github.com:wistityhq/strapi into improve/studio 2015-10-30 14:36:32 +01:00
pierreburgy
a13ad7cf22 Dashboard token and config 2015-10-30 14:36:19 +01:00
loicsaintroch
e9da4c7711 Remove deprecated _admin hook 2015-10-30 13:13:32 +01:00
loicsaintroch
3652f3dd49 Add default options for the dashboard hook 2015-10-30 13:08:26 +01:00
Aurélien Georget
7c20ab8e55 Send dashboard token 2015-10-30 12:22:33 +01:00
Aurélien Georget
eda9b9039f Remove useless pull function for dashboard 2015-10-30 10:34:40 +01:00
Aurélien Georget
d34274abe6 Remove useless rename function 2015-10-30 10:07:42 +01:00
Aurélien Georget
275600fc44 Defer connection to Studio 2015-10-30 10:05:14 +01:00
Aurélien Georget
67de1b791f Disabled Studio connection in production environment 2015-10-29 17:09:09 +01:00
loicsaintroch
260c300168 Fix process.exit typo on load 2015-10-29 15:41:48 +01:00
loicsaintroch
5181c5e994 v1.3.0 v1.3.0 2015-10-28 11:24:30 +01:00
loicsaintroch
320ffe7f11 Bump generator versions 2015-10-28 11:24:21 +01:00
loicsaintroch
89992a48d8 Update to xo v0.10.0 2015-10-28 11:23:59 +01:00
Loïc Saint-Roch
5939128d1c Merge pull request #17 from sylvainlap/improvement/passport 
Passport is now a hook
 2015-10-28 11:03:24 +01:00
SylvainLap
d61aeb1c39 disable session 2015-10-27 17:03:28 +01:00
SylvainLap
71c2d0ede0 indent 2015-10-27 16:34:08 +01:00
SylvainLap
776a1863e2 passport is now a hook 2015-10-27 16:27:57 +01:00
Loïc Saint-Roch
6d6fe997ab Merge pull request #16 from wistityhq/feature/dashboard 
SaaS dashboard explorer
 2015-10-27 12:04:40 +01:00
pierreburgy
dbb1ba32c5 xo tests passing 2015-10-27 11:59:38 +01:00
pierreburgy
6414bc41e8 Merge branch 'master' of github.com:wistityhq/strapi into feature/dashboard 2015-10-27 11:31:33 +01:00
Loïc Saint-Roch
9b60b68e4b Add Balderdash's copyright 2012-2015 in license 2015-10-25 11:37:13 +01:00
loicsaintroch
e2bd15d5f8 Remove useless request when logout via the CLI 2015-10-24 21:29:36 +02:00
loicsaintroch
3068779191 Only show the master branch build for Travis 2015-10-24 11:46:29 +02:00
pierreburgy
04ca6e6ce2 Add logic for dashboard Saas 2015-10-22 17:54:43 +02:00