Commit Graph

734 Commits

Author SHA1 Message Date
Denis Malinochkin 7104dec490 duplicate keys 2014-08-16 17:46:22 +04:00
Samuel Georges 0980c6d997 Merge pull request #549 from Flynsarmy/twigDebugState
Set twigs debug state to the same as Octobers
2014-08-16 18:01:33 +10:00
Samuel Georges d59c469a99 Merge pull request #555 from paulwilde/upstream
Couple more translation strings along with a typo fix.
2014-08-16 14:33:50 +10:00
Paul Wilde 2c46036d2c Added a couple of missing translation strings. Fixed a translation typo for the request log empty button - It should be request_log not event_log. 2014-08-16 05:18:37 +01:00
Sam Georges 96926256c2 Update CHANGELOG.md 2014-08-16 14:10:26 +10:00
Sam Georges d52fe388db Fixes #530 - No more joinWith() and groupBy(), align with Laravel to the best of our ability.
Adds new list column type "nameFrom" (take name from X attribute) as an alternative to "select".
2014-08-16 14:08:51 +10:00
Sam Georges 982b22a676 Fixes #547 - Duplicate assets are pointless 2014-08-16 09:17:09 +10:00
flynsarmy 35e4f9c4fb Tailing comma 2014-08-14 21:08:15 +10:00
flynsarmy 869765af76 Set twigs debug state to the same as Octobers 2014-08-14 21:06:58 +10:00
Sam Georges e4ee8fdc46 * Build 137 2014-08-14 19:38:02 +10:00
Sam Georges f6fc9a9e00 YAML properties should be camelCase 2014-08-14 19:32:48 +10:00
Samuel Georges d9ca311ce3 Merge pull request #545 from marininicola/develop
Fix an issue when searching an asset in CMS backend
2014-08-14 08:25:52 +10:00
Nicola Marini bf1247e197 Fix issue when searching an asset in CMS backend
On Windows, searching for a file return the paths with the "\" separator, and throws an error when selecting a file for editing.
2014-08-13 17:42:51 +02:00
Sam Georges 3ff31f2180 Minor 2014-08-13 21:25:57 +10:00
Samuel Georges bee85771c6 Merge pull request #544 from Flynsarmy/getTwigMethod
Add getTwig controller method
2014-08-13 21:23:54 +10:00
Sam Georges 3b41b3e81f Finish up basic Filter implementation 2014-08-13 21:23:19 +10:00
flynsarmy 55c0ba8934 Add getTwig controller method 2014-08-13 09:08:18 +10:00
Sam Georges 21242b22b8 Fixes #543 - default fallback title isn't being translated inside the modal 2014-08-13 08:11:29 +10:00
Sam Georges 0d9d45e4c0 Refs #543 - Translate the fallback report widget title should the user not set their own 2014-08-13 08:04:04 +10:00
Sam Georges a5d67bee27 Escape all the translated strings 2014-08-13 08:01:18 +10:00
Sam Georges 37291a0c63 Throw ApplicationException when AJAX handler not found 2014-08-13 07:52:47 +10:00
Sam Georges 7d4e535165 Progress to filter widget, added animation less stylesheet 2014-08-13 07:52:46 +10:00
Samuel Georges 6cb95dd041 Merge pull request #541 from paulwilde/develop
More translation strings.
2014-08-13 07:50:43 +10:00
Paul Wilde a3c94d6355 Escape unescaped translations. Add trans() function during output for the Balloon and Widget Selector. 2014-08-12 21:46:19 +01:00
Paul Wilde e0d9b1bb22 Fix argument name. 2014-08-12 01:21:09 +01:00
Paul Wilde 1d038d3173 More translation strings. 2014-08-12 01:15:38 +01:00
Samuel Georges 071cb45355 Merge pull request #539 from paulwilde/develop
Use correct flag for Swedish and larger versions for Retina displays.
2014-08-12 07:47:35 +10:00
Paul Wilde 0ee0957c21 Use large flags for retina displays. 2014-08-11 21:29:52 +01:00
Paul Wilde 7e2f63e315 Use correct flag for Sweden, it was previously set as the El Salvador flag. 2014-08-11 21:23:29 +01:00
Samuel Georges 09369ea7f5 Merge pull request #538 from marininicola/develop
Add italian translation to the backend and fix a bug in the backend toolbar
2014-08-11 21:59:50 +10:00
Nicola Marini 7db69a1d02 Update october.dragscroll.js 2014-08-11 13:57:42 +02:00
Sam Georges f1849c2ea0 Refs #5 - Progress to Filter widget 2014-08-11 21:46:29 +10:00
Nicola Marini 1cb3345deb Visual bug in backend toolbar
In IE 11 / Chrome browsers (i tested with them) in the toolbar menu appears a '>' on the left side of the menu even if there is no need to scroll the toolbar to see other elements.
2014-08-11 13:43:40 +02:00
Nicola Marini 19d06a0489 Italian translation
Add the italian translation for the October CMS
2014-08-10 14:26:20 +02:00
Nicola Marini a7b59756cf Italian translation
Add the italian translation for the October CMS
2014-08-10 14:24:54 +02:00
Nicola Marini 394679efaf Italian translation
Add the italian translation for the October CMS
2014-08-10 14:23:52 +02:00
Nicola Marini 59cdfe1386 Italian translation
Add the italian translation for the October CMS
2014-08-10 14:22:07 +02:00
Nicola Marini 17965098ce Italian translation
Add the italian translation for the October CMS
2014-08-10 14:19:06 +02:00
Nicola Marini 5b6e75357b Italian translation
Add the italian translation for the October CMS
2014-08-10 14:17:43 +02:00
Sam Georges f18c905f9b Minor 2014-08-09 13:04:16 +10:00
Sam Georges 20255541b9 Add info about LESS compilation 2014-08-09 13:04:00 +10:00
Samuel Georges a3392ecb50 Merge pull request #535 from boulox/system-french-trad
Add some missing french translation
2014-08-09 12:22:41 +10:00
Sam Georges 13587f155c Move trans from logic-less array to inside business logic. Convert tabs to spaces. 2014-08-09 12:21:17 +10:00
Samuel Georges 5a36debecf Merge pull request #534 from paulwilde/develop
More translation strings.
2014-08-09 12:06:32 +10:00
Boulox fb13094190 Add some missing french translation 2014-08-09 04:02:54 +02:00
Paul Wilde 906370c6bd Added translation strings for permission labels, mail template/layout column labels, editor fullscreen, list pagination and list setup modal. 2014-08-09 03:02:15 +01:00
Samuel Georges c92c36aeff Merge pull request #533 from paulwilde/lang-update
Allow the dashboard widget inspector and status report widget to be translated.
2014-08-09 11:07:12 +10:00
Paul Wilde de98451148 Allow the dashboard widget inspector and report widget to be translated. 2014-08-09 01:29:19 +01:00
Samuel Georges 63eeebcab5 Merge pull request #532 from paulwilde/translate-fix
Translate My Settings heading.
2014-08-09 09:08:04 +10:00
Paul Wilde c1856dfbe2 Translate My Settings heading. 2014-08-08 21:41:32 +01:00