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
2,408 Commits 35 Branches 172 Tags
Commit Graph

595 Commits

Author SHA1 Message Date
Samuel Georges
85933facbc Stack partials, store components, unstack partials - Fixes #1373 
Fixes instances where nested repeating partials are destroying the partial component stack and causing breaking errors.
Nesting example:

Partial (with components)
^-> Calls component default markup
^-> Refers to partial override (with repeating partial calls)
^-> Calls another partial (with components)
^-> Components not found (destroyed by repeating calls above)
 2015-08-15 11:05:30 +10:00
Samuel Georges
0e3403f1aa Use a nicer syntax for <html lang="" /> 
Recompile assets
 2015-08-15 09:49:51 +10:00
Jérémy GAULIN
3f8d17995a Translate alert messages. Switched to sweetAlert.alert() instead of raw window.alert(). 
Override `swal` and `sweetAlert` functions to set translation on default buttons.

Changed `sweetAlert()` to `swal()` to be consistent with `mediamanager.js`
 2015-08-15 09:46:24 +10:00
Samuel Georges
b8bc6c6d99 Allow the "go up" link to be selected with the mouse - Refs #1360 
This will disable the move and delete buttons
 2015-08-15 09:17:30 +10:00
Jofry
8973761146 Merge pull request #1 from jofrysutanto/master 
Show mediamanager sidebar preview when "Go up" is selected.
 2015-08-08 22:57:21 +10:00
jofrysutanto
871f824582 Show mediamanager sidebar preview when "Go up" is selected. 
Show more informative sidebar information when "Go up' is selected, instead of blank file information with 'null' public url.
 2015-08-08 22:52:21 +10:00
Samuel Georges
d537cef720 Merge pull request #1347 from powelski/resolve-1272 
Escape HTML for .txt contents
 2015-08-08 11:40:58 +10:00
Samuel Georges
2cf1d707ad The API response for insert / insert+crop should be identical 
This is because the 'onInsert' callback is used for both actions, yet yielded different results causing breakages
Fixes #1281
Also improved code readability in some places
 2015-08-08 11:17:56 +10:00
Nicola Marini
b579891164 Update lang.php 
Update lang.php

Update lang.php

Update validation.php

Update lang.php

Update lang.php
 2015-08-08 10:31:17 +10:00
Finjon Kiang
cebf7466a9 add new language zh-tw / Chinese (Taiwan) 2015-08-08 10:12:23 +10:00
Krzysztof Powelski
9c3f83c54f Escape HTML for .txt contents 2015-08-05 00:00:43 +02:00
Samuel Georges
b010732796 These methods should be protected, update client lang 2015-08-04 10:01:17 +10:00
Samuel Georges
52361e9b4d Merge pull request #1324 from acwoss/develop 
Update pt-br lang
 2015-08-03 20:12:57 +10:00
Samuel Georges
8cd97b27a6 Add prettify, update Ace, recompile assets 2015-08-03 19:00:45 +10:00
Samuel Georges
3e898064e1 Translate some client side strings 2015-08-03 18:59:37 +10:00
Anderson Carlos Woss
bfdcfa69da Update PT-BR lang 2015-07-30 00:37:23 -03:00
Samuel Georges
f47b99d183 Move storm to its own build 2015-07-29 19:13:42 +10:00
Samuel Georges
c3d44fb0b4 Merge pull request #1307 from GeGeek/patch-2 
Update lang.php
 2015-07-25 15:39:34 +10:00
Tom
506f7502ea update Chinese Language File 2015-07-25 15:29:07 +10:00
Asselin de Beauville
26882346c4 Update lang.php 
Updated 'settings_menu' var.
 2015-07-25 07:28:43 +02:00
Samuel Georges
d931c6ecfc Merge pull request #1296 from mrmlnc/path-1 
Update Ru_lang to current status develop branch
 2015-07-25 15:19:13 +10:00
Samuel Georges
bdc05a20fe Merge pull request #1291 from DZB-Team/develop 
Some new language strings...
 2015-07-25 15:18:17 +10:00
Samuel Georges
d6d48b4580 Merge pull request #1285 from bilgorajskim/bilgorajskim-patch-1 
Update Polish translation
 2015-07-25 15:04:52 +10:00
Samuel Georges
561adcfb37 Merge pull request #1279 from tsioukas/patch-1 
Added new phrases on Greek Language
 2015-07-25 15:01:01 +10:00
Samuel Georges
a5531f931b Manual merge - fixes #1278 Thanks @Freakspot 2015-07-25 15:00:19 +10:00
Samuel Georges
0f215785f3 Rollback the idea of using $visible on CmsCompoundObjects 
This feature should be reserved for serializing the object (in future maybe) rather than defining visible properties, these should be relaxed.
 2015-07-25 11:07:36 +10:00
Samuel Georges
52ea4a73c8 Performance improvements, rename scopes to standard 2015-07-21 20:46:35 +10:00
Denis Malinochkin
5f1e03fc46 Update Ru_lang to current branch 2015-07-18 15:53:02 +03:00
raw99
b2d7cea159 Removing dublicate string 2015-07-14 19:36:55 +03:00
Samuel Georges
41a94a50ae Fixes broken critical bum bum 2015-07-14 20:47:00 +10:00
bilgorajskim
3ed3716548 Update polish translation 2015-07-13 09:54:58 +02:00
bilgorajskim
0c7c6f4895 Update polish translation 2015-07-13 08:59:28 +02:00
Antony Tsioukas
b3bf7645a0 Added new phrases on Greek lang.php 2015-07-11 19:08:01 +03:00
Samuel Georges
961509839e Manually merge Pull Requests that are prepared incorrectly 
Fixes #1229
Fixes #1259
Fixes #1260
Fixes #1261
Fixes #1262
Fixes #1263
Fixes #1264
Fixes #1277
Thanks @felixinx @awaysoft @tsioukas @Freakspot
 2015-07-11 14:36:38 +10:00
Samuel Georges
60fac726a9 Merge pull request #1274 from powelski/develop 
Translate Media to Polish language
 2015-07-11 11:48:05 +10:00
Samuel Georges
eb5a1b7039 Merge pull request #1268 from scottbedard/patch-4 
Fix location of mediafinder comments
 2015-07-11 11:30:04 +10:00
Samuel Georges
a3223e8d03 Merge pull request #1256 from sajjad-ser/master 
update persian language
 2015-07-11 11:26:41 +10:00
Samuel Georges
84da7f3698 Improve tabs consistency, fix conflict with .primary 
.primary -> .primary-tabs
.secondary -> .secondary-tabs
.master -> .master-tabs
 2015-07-10 15:51:24 +10:00
Kris Powelski
502a13f08d Translate Media to Polish language 2015-07-09 18:48:10 +02:00
Scott Bedard
2b4b891586 Fix location of mediafinder comments 
Without the overflow, mediafinder comments render in a weird location (see before / after screenshots)

https://www.dropbox.com/s/ogxfcaky6tdkki4/before_overflow.png?dl=0
https://www.dropbox.com/s/bsn0s0fjpj7j9iz/after_overflow.png?dl=0
 2015-07-08 13:32:43 -04:00
Sajjad
711df56986 update persian language 2015-07-05 21:26:39 +04:30
Samuel Georges
4f0fa37d6f Update of FRENCH Translation for OctoberCMS - thanks @Galixte 
Fixes #1248 without 11 commits
 2015-07-04 10:36:32 +10:00
Samuel Georges
b9e4eeb60c Merge pull request #1252 from DZB-Team/develop 
Some small Latvian language fixes...
 2015-07-04 10:26:15 +10:00
Samuel Georges
adfc198428 Merge pull request #1239 from gergo85/master 
Updated Hungarian language
 2015-07-04 10:25:11 +10:00
Samuel Georges
461e4f75de Improve admin list toolbar 
Change "Admins" group to "Owners" (more descriptive)
Fix bug in Firefox on Mediafinder form widget not respecting max-width 100%
Recompile assets
 2015-07-04 09:34:35 +10:00
raw99
9e59382822 Some small fix again... 2015-07-01 23:24:39 +03:00
raw99
8a36ad5403 Some Latvian language fixes... 2015-07-01 23:13:30 +03:00
Samuel Georges
f9c921a797 Adds getAjaxHandler() API to controllers 
Fixes bug where update process fails midway
 2015-06-30 08:56:53 +10:00
Szabó Gergő
0ed57bb692 Updated Hungarian language 2015-06-27 11:58:30 +02:00
Samuel Georges
81eb02296d Fixes broken invalid state 2015-06-27 14:53:17 +10:00