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

4086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Georges
381ae475c2 Merge pull request #2497 from gpasztor87/develop 
Allow combine scss files from command.
 2016-11-17 08:09:48 +11:00
Pásztor Gábor
cf1fda7437 Allow combine scss files from command. 2016-11-16 20:09:46 +01:00
Luke Towers
05ab8bdb01 Pass current model to RelationController view & manage scopes 
This improves the extensibility of the relation controller by passing the parent relation model to the query scope that will be applied to both the view and manage options. It allows the use of attributes of the parent relation model in the query scope applied to the relation.

This is a mirror of october/octobercms#2419, except for the relation controller instead of the record finder widget. If necessary, I can create a case in the test plugin, but if this is simple enough with the added reference to the prior PR to not require a case in the test plugin, that would be simpler for me :) 

@daftspunk, let me know what you think.
 2016-11-16 12:05:44 -06:00
Samuel Georges
1a41f632bc Merge pull request #2477 from zerkms/USER_FILTER_SUPERUSER_BOOLEAN 
[!!!] Fix for postgresql: you cannot compare a boolean column with integers
 2016-11-16 07:14:56 +11:00
Ivan Kurnosov
c9ba4c49e6 Fix for postgresql: you cannot compare a boolean column with integers 2016-11-15 16:55:23 +13:00
Samuel Georges
5c5ffb7950 Merge pull request #2483 from henrydinhh/master 
Add Vietnamese Map
 2016-11-15 07:48:21 +11:00
Samuel Georges
f4f7355bf2 A nested tab plugin's tabs are leaking in to the parent tab plugin. 
Fixes #2481
 2016-11-14 08:46:32 +11:00
Henry Dinh
4c34b798ce Add Vietnamese Map 2016-11-12 21:02:32 +07:00
Samuel Georges
a2a0b207c6 Expose isCodeViewActive API function 
Recompile JS
v1.0.381 		2016-11-12 14:12:48 +11:00
Samuel Georges
0bcf8f47c1 Allow .well-known directory thru the gates 
In accordance with RFC 5785 https://tools.ietf.org/html/rfc5785
Fixes #2480
 2016-11-12 13:29:10 +11:00
Samuel Georges
3ca1a6fc17 Merge pull request #2479 from gergo85/patch-1 
Extend the licence file name list
 2016-11-12 12:38:27 +11:00
Szabó Gergő
74cf5da83b Extend the licence file name list 
Some plugin use the LICENSE.md file name instead of LICENCE.md.
 2016-11-11 09:56:46 +01:00
Szabó Gergő
d1268c9905 Translate the Page link popup (#2467) 
* Translate the Page link popup

* Remove the unnecessary dot

* Update the import/export Hungarian translation

* Update the Froala Hungarian translation
 2016-11-10 07:39:29 +11:00
Samuel Georges
be3bf61a3b Merge pull request #2470 from acrontum/develop 
Update DE Lang File
 2016-11-10 07:36:05 +11:00
Samuel Georges
a313d4eb5b Minor fixes 2016-11-10 06:49:45 +11:00
Michael Brode
dc3c2efe6a Update DE Lang File 2016-11-09 08:36:04 +01:00
joseph-d
af7950b9d0 Update Filter.php 
There is an addScopes function for extensibility but no way to remove scopes which are already there.
 2016-11-08 09:46:27 +00:00
Samuel Georges
bda625fe58 Remove dependency for NIH method 
Refs #2454
v1.0.380 		2016-11-08 08:21:29 +11:00
Samuel Georges
c32c001c20 Merge pull request #2454 from zerkms/MIRROR_RELATIVE 
Added `--relative` option to the `october:mirror` command
 2016-11-08 07:48:58 +11:00
Samuel Georges
46c473e2f2 Fixes fetching multi tiered pivot relation values 
Refs https://github.com/daftspunk/oc-crm-plugin/issues/3
Minor code clean on select.js
 2016-11-08 07:02:31 +11:00
Samuel Georges
4aca2d40ff Remove "allowClear" and tidy up #2459 
Allow clear is not necessary, equivalent of allowClear false is "placeholder" and allowClear true is "emptyOption".
 2016-11-07 08:43:52 +11:00
Joseba Juániz
1ee0250441 Dropdown can support either placeholder / emptyOption 
The difference between a placeholder and an emptyOption is that the placeholder cannot be reselected,whereas the emptyOption can.
Fixes #2450
 2016-11-07 08:29:49 +11:00
Samuell1
b320632eb4 Fixes taglist working inside a repeater 
Fixes #2254
 2016-11-07 08:08:48 +11:00
Samuel Georges
6985139d44 Merge pull request #2463 from gpasztor87/line-chart-doc 
Added line chart documentation
 2016-11-07 08:06:38 +11:00
Pásztor Gábor
4685ea98c2 Added line chart documentation 2016-11-06 21:56:18 +01:00
Samuel Georges
bea610912a Merge pull request #2461 from gpasztor87/develop 
JS fixes and typo
 2016-11-07 07:50:10 +11:00
Pásztor Gábor
98315b0f72 JS fixes and typo 2016-11-06 17:14:12 +01:00
Samuel Georges
50d3ffb035 Halycon models do not declare forceFill 
Only bind purgeable fallback event once (only needed once)
Refs https://github.com/rainlab/translate-plugin/issues/54#issuecomment-256067096
v1.0.379 		2016-11-05 10:59:53 +11:00
Samuel Georges
7b0f33e9b3 Adds an isNested flag to Form widget 
This is useful when a form renders another form inside, specifically the repeater. In these cases the model and data will diverge, and it also provides an opportunity to not apply extension logic to nested form fields.
Fixes #2257
 2016-11-05 09:53:23 +11:00
Ivan Kurnosov
b1ff9f78ba Added --relative option to the october:mirror command 2016-11-04 10:29:46 +13:00
Samuel Georges
348dd85338 Merge pull request #2446 from justin-lau/fix-import-file-path-order 
Fixing default import template doesn't extract columns from the latest uploaded file.
 2016-11-03 07:10:16 +11:00
Samuel Georges
e45dc9601c Add database test for import model 
Refs #2446
 2016-11-03 07:09:47 +11:00
Samuel Georges
6173ff177b Typo in variable name v1.0.378 2016-11-02 08:58:07 +11:00
Samuel Georges
0aadcc6675 Merge paths and vars when calling widget handler 
When an AJAX handler is called for a widget, the view paths and specified variables should be merged in to the controller. This sets the appropriate context:

1) Look at the widget first
2) Fall back to the controller

Fixes #2432
 2016-11-02 08:50:15 +11:00
Samuel Georges
ced920e5d2 Exception handling 
Addresses issue specified in https://github.com/daftspunk/oc-test-plugin/issues/21
 2016-11-02 07:21:04 +11:00
Samuel Georges
bc165078de Removes redundant code 
The form widget label and widgetDetails() method was intended for use by the Builder plugin, since it ended up using its own internal registration system, this is not used anywhere so is removed.

Refs https://github.com/octobercms/docs/issues/200
 2016-11-01 08:15:03 +11:00
Samuel Georges
943868e242 Merge pull request #2447 from scottbedard/patch-1 
Add 7.1 and nightly
v1.0.377 		2016-10-29 14:15:31 +11:00
Samuel Georges
57b10704ce Support for overriding list views 
For consistency, entry partial for controller behaviors should be called "container"
Added addViewPath() method to ViewMaker
Remove "fa" from icon docs (not necessary)
Fixes #2439
 2016-10-29 14:10:21 +11:00
Samuel Georges
788f109361 Use transactions when saving form models 
This is a good idea in general to protect the data integrity. There may be some edge cases where transactions are undesirable, if/when we find one, a configuration option should be created to disable this behavior.
Fixes #2431
 2016-10-29 11:28:39 +11:00
Samuel Georges
55848e400c Empty CMS section when only manage_themes permission granted 
Fixes #2425
 2016-10-29 10:23:50 +11:00
Justin Lau
844d2d1b28 Use id instead of updated_at for more consistent behavior 2016-10-27 00:31:44 +08:00
Samuel Georges
359461d93e Styling fix to the welcome widget 
Add unit test for constraining by pivot data
 2016-10-25 07:33:24 +11:00
Scott Bedard
92a955381b Add 7.1 and nightly 2016-10-24 13:14:19 -07:00
Justin Lau
325ae4ad08 Return the latest uploaded (updated) file path. 2016-10-25 00:21:18 +08:00
Samuel Georges
ee2dd78b3d Exception handling for type: relation 
It would appear many plugins incorrectly use type: relation as a list column, when this does nothing. Previously it would fallback to the text type, now that invalid types fail hard, this adds a softer landing by spamming the trace log instead.
Refs #2438
 2016-10-22 04:18:28 +11:00
Samuel Georges
91e7e8b950 List column number type was falling back to text 
Since custom list column types an exception is thrown for unknowns. This makes number known.
Fixes #2438
v1.0.376 		2016-10-22 03:10:50 +11:00
Samuel Georges
f9dd5b2f57 Plugins can now define custom list column types v1.0.375 2016-10-21 07:15:08 +11:00
Samuel Georges
88196fb660 Allow passing an explicit format to datepicker 
Refs #1919
Recompile assets
 2016-10-20 08:44:14 +11:00
Samuel Georges
535dc78db1 Pass model as 3rd arg in relation extend overrides 
Refs #2308
v1.0.374 		2016-10-19 08:45:43 +11:00
Samuel Georges
f74d95392f Fix instances where defineProperties returns nothing 
addPurgeableAttribute -> addPurgeable
 2016-10-19 07:21:09 +11:00