581 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andy Miller	d2b76ba93a	Merge branch 'develop' into feature/work-on-languages-workflow ... Conflicts: classes/controller.php	2015-08-20 18:15:09 -06:00
Andy Miller	8aa5c0ac2f	various fixes for redirects and parents	2015-08-20 18:11:54 -06:00
Andy Miller	0af4d223fe	redirect to rawroute	2015-08-20 15:39:13 -06:00
Andy Miller	3692dca100	Default to english if language is not set	2015-08-20 15:23:50 -06:00
Andy Miller	8e09213dc9	Fix for #84 - unique page counting	2015-08-20 15:23:20 -06:00
Andy Miller	6333c5886c	Fix for #84 - unique page counting	2015-08-20 14:55:24 -06:00
Flavio Copes	5ad210029b	Solve issue in redirect with adding a new page (and other situations)	2015-08-20 19:55:33 +02:00
Andy Miller	b50cbbc778	Default to english if language is not set	2015-08-20 11:29:37 -06:00
Andy Miller	c0b9a6e8c5	missing lang string	2015-08-20 10:54:27 -06:00
Flavio Copes	576a4f0765	Incorporate andy fixes, and correctly set redirects on switching language and saving as a new language	2015-08-20 17:00:46 +02:00
Flavio Copes	bf4f728232	Fix redirect for new pages	2015-08-20 16:03:54 +02:00
Flavio Copes	f409799ce8	On a new page, don't show "save as [language]". And, just show the current language	2015-08-20 16:03:43 +02:00
Flavio Copes	6dc5d5be06	Fix for single-language pages	2015-08-20 15:43:20 +02:00
Flavio Copes	d727b6c9d9	Correct behavior of the lang switcher buttons	2015-08-20 15:18:15 +02:00
Flavio Copes	16fe926e5d	Make sure that saving a page just saves it in its own language	2015-08-20 15:17:45 +02:00
Flavio Copes	c4127be37d	Re-added language checks in the controller redirect function. Ensures Grav admin always has the correct language set in the links (otherwise it's not happening). Bring back some lines removed in 8e814e30ad	2015-08-20 15:17:11 +02:00
Matias Griese	c6b1f1d2eb	Fix blueprints to be loaded by using blueprints:// stream (#38)	2015-08-20 11:58:14 +03:00
Djamil Legato	0d6124a525	Ensuring a form element exists in the DOM, otherwise discard it from cache. (fixes #79)	2015-08-19 21:01:17 -07:00
Djamil Legato	f7da16241a	Loading sortables from base	2015-08-19 21:00:17 -07:00
Andy Miller	a495fd0924	preview **should** use route, not rawRoute	2015-08-19 17:02:59 -06:00
Andy Miller	dc24c93b50	simplified the page macro a little more	2015-08-19 16:55:15 -06:00
Andy Miller	8e814e30ad	simplified redirect that was causing some issues	2015-08-19 16:54:48 -06:00
Andy Miller	7fcf239132	removed some double slash situations	2015-08-19 16:54:30 -06:00
Andy Miller	7cd4e5b0a6	added missing uninstall strings	2015-08-19 16:53:21 -06:00
Andy Miller	f8d47edbbd	refactored the page loop a bit to use _context	2015-08-19 14:58:18 -06:00
Andy Miller	366b2a05a6	Merge branch 'develop' of https://github.com/getgrav/grav-plugin-admin into develop	2015-08-19 12:52:23 -06:00
Andy Miller	9698c3b34c	toolbar tightening	2015-08-19 12:52:18 -06:00
Andy Miller	d773a878de	Fix for #54 issue - Call to a member function path() on a non-object	2015-08-19 12:51:55 -06:00
Andy Miller	954940755c	Merge pull request #81 from Sommerregen/bugfix/minor-param-sep-fixes ... Bugfix/minor param sep fixes	2015-08-19 12:22:45 -06:00
Sommerregen	59f9c75e2a	Some more fixes	2015-08-19 20:04:25 +02:00
Sommerregen	8f57adde65	Minor param_sep fixes	2015-08-19 20:03:05 +02:00
Flavio Copes	2d3ef8bedd	More italian strings	2015-08-19 17:33:26 +02:00
Flavio Copes	d8dec31864	Language file	2015-08-19 17:31:03 +02:00
Flavio Copes	fab0d61ab0	Allow to save the currently edited page as a new language	2015-08-19 17:30:25 +02:00
Flavio Copes	06173decfb	Fix URL issue in copy	2015-08-19 17:29:38 +02:00
Flavio Copes	616b896cfd	Add taskSaveas() to save a page in a new language	2015-08-19 17:28:39 +02:00
Flavio Copes	8d2440d238	Make sure we always have the language code in the URL	2015-08-19 17:27:57 +02:00
Flavio Copes	a27ee216dd	Add the correct task from the button clicked. Not be the best solution but solved the problem. Looking for a more correct solution later.	2015-08-19 17:27:34 +02:00
Flavio Copes	c2a54b3770	Add a button to switch to a different language version of a page. Uses the switchlanguage task to which I added a redirect parameter to correctly switch the language	2015-08-19 14:32:06 +02:00
Flavio Copes	c64432af15	Use default routes if set	2015-08-19 11:33:51 +02:00
Flavio Copes	b4212847f4	Avoid losing the language code when switching normal/expert mode in "edit page"	2015-08-19 10:23:48 +02:00
Flavio Copes	79bafcd6ab	Correctly set the default language when not set in the user yaml (fixes language not changing problem)	2015-08-19 10:17:50 +02:00
Andy Miller	ecef4a19f2	Updated with rawRoute() again	2015-08-18 22:33:11 -06:00
Andy Miller	7ebd32cdb2	back to using local names	2015-08-18 19:07:03 -06:00
Andy Miller	6fba96b0b0	refactored the lang dropdown a little	2015-08-18 19:05:33 -06:00
Andy Miller	b27bf51e79	more translation in fields	2015-08-18 18:51:44 -06:00
Andy Miller	cd0038bd5e	Revert "use raw route for page link" ... This reverts commit 607f017632.	2015-08-18 18:47:45 -06:00
Flavio Copes	8cba4cd03a	Fix help translation	2015-08-18 22:08:01 +02:00
Flavio Copes	1efd31df5c	Merge pull request #77 from kevinkub/patch-2 ... Added German Language	2015-08-18 21:57:56 +02:00
Andy Miller	607f017632	use raw route for page link	2015-08-18 13:53:42 -06:00