2461 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	a19a445d73	Merge pull request #394 from strapi/fix/models-functions ... Fix models functions life cycle	2017-12-21 13:46:44 +01:00
Jim Laurie	e5d15fdd0b	Merge branch 'master' of https://github.com/strapi/strapi into fix/models-functions	2017-12-21 13:31:57 +01:00
Jim LAURIE	d3b68aa5c8	Merge pull request #400 from strapi/documentation/filter_sort ... Improve documentation for sorting filters	2017-12-21 13:31:02 +01:00
Aurelsicoko	ca7f12e985	Improve documentation for sorting filters	2017-12-20 16:06:02 +01:00
Jim Laurie	987fbcffa7	Also restore remove function	2017-12-19 14:52:13 +01:00
Jim Laurie	d773c849a4	Fix before and after remove data life cycle functions	2017-12-19 14:47:48 +01:00
cyril lopez	05b699f557	Merge pull request #388 from strapi/fix/ctm-model-entries ... Fix model entry count when deleting an entry and handle singular for …	2017-12-18 15:33:27 +01:00
cyril lopez	bc25ca3870	Fix typo	2017-12-18 15:18:03 +01:00
cyril lopez	c0e032969c	Fix model entry count when deleting an entry and handle singular for entries number	2017-12-18 15:08:25 +01:00
cyril lopez	669cdcf104	Merge pull request #384 from strapi/fix/ctm-back-header ... Fix ctm editview backheader	2017-12-16 17:45:00 +01:00
cyril lopez	83500c4e3b	Update branch ... Merge branch 'master' of github.com:strapi/strapi into fix/ctm-back-header	2017-12-16 14:54:40 +01:00
cyril lopez	f9d1e98644	Merge pull request #380 from strapi/fix-language ... Fix stm add language bug	2017-12-16 14:54:07 +01:00
cyril lopez	0ff0b2e2aa	Fix ctm editview backheader	2017-12-16 12:26:47 +01:00
Jim LAURIE	9b9ee3bc83	Remove spaces	2017-12-15 18:15:38 +01:00
cyril lopez	78e1442342	Update branch ... Merge branch 'master' of github.com:strapi/strapi into fix-language	2017-12-15 18:06:06 +01:00
Jim LAURIE	fff73de9c7	Merge pull request #381 from strapi/fix/alpha.7.1 ... Fix alpha.7.1	2017-12-15 15:27:40 +01:00
Jim Laurie	5b6127876d	3.0.0-alpha.7.2	2017-12-15 15:04:31 +01:00
Jim Laurie	4cb88af247	Fix PR feedback	2017-12-15 14:22:11 +01:00
cyril lopez	aa02d5408a	Improve login errors	2017-12-15 13:24:08 +01:00
cyril lopez	5b542cff20	Fix left menu content manager links	2017-12-15 11:30:51 +01:00
Jim Laurie	b5c813e5f8	Can not set role 0 to someone user API	2017-12-15 10:49:01 +01:00
Jim Laurie	f12927d2ce	Delete role collapse chevron if no API	2017-12-14 17:06:26 +01:00
Jim Laurie	78c2b252cd	Fix find users	2017-12-14 16:29:13 +01:00
cyril lopez	55d839113d	Fix stm add language bug	2017-12-14 16:28:51 +01:00
Jim Laurie	22a7e91036	Fix get user info link in search list	2017-12-14 16:15:32 +01:00
Jim Laurie	2715f2693f	Check if token user still exist	2017-12-14 16:12:39 +01:00
Jim Laurie	c7ef225238	Replace id to _id for fetch user mongoose	2017-12-14 15:14:53 +01:00
Jim LAURIE	5962052287	Merge pull request #377 from strapi/3.0.0-alpha.7.1 ... 3.0.0-alpha.7.1	2017-12-14 14:08:53 +01:00
Jim Laurie	1ab6ae71d8	3.0.0-alpha.7.1	2017-12-14 10:27:08 +01:00
Jim LAURIE	f39a675690	Merge pull request #376 from strapi/fix/gitignore ... Fix .gitignore file generation	2017-12-13 16:33:33 +01:00
Jim Laurie	feb0fd3931	Merge branch 'master' of https://github.com/strapi/strapi into fix/gitignore	2017-12-13 16:16:48 +01:00
Jim LAURIE	bd2ea33de6	Merge pull request #375 from strapi/update/roadmap ... Update ROADMAP	2017-12-13 16:15:47 +01:00
Jim Laurie	3685878d82	Merge branch 'master' of https://github.com/strapi/strapi into update/roadmap	2017-12-13 15:57:34 +01:00
Jim LAURIE	ce2e79b08e	Merge pull request #373 from strapi/update-getting-started-doc ... Update getting started doc	2017-12-13 15:56:48 +01:00
Jim Laurie	fffb7af2e4	Merge branch 'master' of https://github.com/strapi/strapi into update-getting-started-doc	2017-12-13 15:43:16 +01:00
Jim LAURIE	3695cada33	Merge pull request #372 from strapi/fix/documentation-links ... Add authentification link in doc menu	2017-12-13 15:40:43 +01:00
Jim Laurie	08411082b8	Merge branch 'master' of https://github.com/strapi/strapi into fix/documentation-links	2017-12-13 15:19:55 +01:00
Jim Laurie	d089f3fe29	Fix PR feedback	2017-12-13 15:17:40 +01:00
Jim Laurie	cc4e1bd762	Merge branch 'master' of https://github.com/strapi/strapi into update-getting-started-doc	2017-12-13 15:15:56 +01:00
Jim LAURIE	8cc616f6b6	Merge pull request #374 from strapi/improve-user-edit-section ... Improve UX when editing a role	2017-12-13 15:15:10 +01:00
Aurelsicoko	a6bd10cf11	Update ROADMAP	2017-12-13 14:50:56 +01:00
Jim Laurie	f9126e5f0d	Fix .gitignore file generation	2017-12-13 14:23:07 +01:00
cyril lopez	13383d9f7c	Open the application s permissions section if there are APIs	2017-12-13 13:43:36 +01:00
cyril lopez	0a2165f97f	Fix typo	2017-12-13 13:37:11 +01:00
cyril lopez	4028e5c88f	Update getting started	2017-12-13 13:24:46 +01:00
cyril lopez	a641b8ec93	Update contributing guide	2017-12-13 12:21:16 +01:00
Jim Laurie	e80ce765af	Change alpha version	2017-12-13 11:24:51 +01:00
Jim LAURIE	348b4d1b27	Merge pull request #366 from strapi/fix-login-redirect ... Prevent user from going to login page if no user is registered	2017-12-13 11:12:14 +01:00
Jim Laurie	56708f7cd8	Add authentification link in doc menu	2017-12-13 11:04:44 +01:00
cyril lopez	d843886696	Update branch ... Merge branch 'master' of github.com:strapi/strapi into fix-login-redirect	2017-12-13 10:59:12 +01:00