mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity
962 Commits 35 Branches 172 Tags
Commit Graph

962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Georges
2adeb7de2d Streamline partial usage in form fields and list columns 2014-08-23 11:11:49 +10:00
Sam Georges
7beafebf7c getClassExtension -> asExtension (shorter syntax) 2014-08-23 09:41:48 +10:00
Sam Georges
3c8f3cdb3f Ctrl/Cmd+S should work inside Redactor 2014-08-22 21:47:22 +10:00
Sam Georges
4db38b1650 Improve october.hotkey.js 2014-08-22 21:02:32 +10:00
Sam Georges
799273414f Update redactor to latest 2014-08-22 20:15:12 +10:00
alekseybobkov
e7767176ce Updated the treeview control, updated Redactor scripts, the CMS Content is now a compound object 2014-08-22 18:45:05 +11:00
flynsarmy
d0b557cbdf Fix formwidget IDs for nested fields 2014-08-22 15:08:00 +10:00
flynsarmy
4df7af076d Remove unused variables 2014-08-22 14:59:32 +10:00
flynsarmy
11acd6e799 Refs #485, #504 - Add support for nested columns. 2014-08-22 14:38:53 +10:00
Samuel Georges
fb56fbfabd Merge pull request #573 from mrmlnc/develop 
ru_lang (138)
 2014-08-22 08:07:10 +10:00
Samuel Georges
111589dec6 Merge pull request #577 from stefantalen/dutch-translations 
Updated dutch language files
 2014-08-22 08:06:48 +10:00
Stefan Talen
5455c6c1af Updating dutch language files 2014-08-21 23:07:50 +02:00
Sam Georges
76b143e8d3 Components and variables can now be accessed in the page code section via $this->foo in addition to $this['foo']. 2014-08-21 20:04:41 +10:00
Sam Georges
20e279bf4c Page URLs now support dots (.) 
Add hook for cms.page.init
 2014-08-21 19:47:29 +10:00
Samuel Georges
e73f82bffe Merge pull request #570 from Flynsarmy/popupErrors 
Refs #568 - Inherit the parent framework error function
 2014-08-21 08:12:43 +10:00
Denis Malinochkin
9a798cf46a ru_lang (138) 2014-08-20 17:10:22 +04:00
flynsarmy
80b10bd45b Refs #568 - Inherit the parent framework error function 2014-08-20 15:37:10 +10:00
Sam Georges
5df02a3eb9 Refs #568 - Inherit the parent framework success function 2014-08-20 10:12:44 +10:00
Sam Georges
d2e2e1ffff Local events also don't need prefixes 2014-08-19 21:34:59 +10:00
Sam Georges
7bd967cff5 Fix cms.template.save event, should always pass the primary object as the first/second parameter. 
This may be a breaking change for some, sorry about that.
 2014-08-19 21:33:03 +10:00
Sam Georges
3f8d3d8eea Fixes rebase issue in #557 2014-08-19 12:40:18 +10:00
Sam Georges
d7f22dc797 Merge branch 'develop' 2014-08-19 12:38:25 +10:00
Samuel Georges
785961e4e2 Merge pull request #557 from climaxx/master 
Added Romanian translation to the backend of OctoberCMS
 2014-08-19 12:37:15 +10:00
Sam Georges
bcc48054e7 Add hook to render page 2014-08-19 12:35:33 +10:00
Samuel Georges
ea69dad112 Merge pull request #558 from mrmlnc/develop 
duplicate keys
 2014-08-19 12:34:28 +10:00
Denis Malinochkin
7104dec490 duplicate keys 2014-08-16 17:46:22 +04:00
adi
03d9f81b47 Added Romanian translation files in modules/*/lang/ro and modified modules/backend/models/BackendPreferences.php and modules/system/lang/en/lang.php in order for the language to appear in the admin section 2014-08-16 15:00:07 +03: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
alekseybobkov
176f41f0f1 Merge branch 'develop' of github.com:octobercms/october into develop 2014-08-14 16:51:49 +11:00
alekseybobkov
4f55def792 Implementing the treeview element 2014-08-14 16:51:31 +11: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