Commit Graph

2424 Commits

Author SHA1 Message Date
Samuel Georges e0fc27b0cb Refs #1727 - Tabs to spaces 2016-02-13 15:47:34 +11:00
Samuel Georges 7d3a73cd31 Merge pull request #1727 from tschallacka/fix_for_static_primary_key_naming_relationcontroller
Fix for static primary key naming relationcontroller
2016-02-13 15:46:07 +11:00
Samuel Georges 43f1ce7734 Merge pull request #1723 from Herlevsen/develop
Make default 404 page use 404 status code
2016-02-13 15:43:48 +11:00
Samuel Georges 668ccf2588 Merge pull request #1722 from tresbach/patch-1
Fix negative count
2016-02-13 15:30:22 +11:00
Samuel Georges 6562170d2a Merge pull request #1719 from alxy/patch-12
Fix doubble-applied filters
2016-02-13 13:56:39 +11:00
Samuel Georges cc531a25e2 Merge pull request #1715 from initbizlab/master
Added switch option translation (Polish)
2016-02-13 13:55:44 +11:00
Samuel Georges 6ca0561946 Merge pull request #1713 from jBOKA/patch-1
German translation (Import/Export)
2016-02-13 13:55:30 +11:00
alekseybobkov c762ed2836 Merge branch 'builder-ui' into develop 2016-02-07 14:41:45 -08:00
alekseybobkov 1454a4ed6b Fixed a bug in the Inspector string list autocomplete editor where clicking an item in the autocompletion list doesn't select the item. 2016-02-07 14:40:31 -08:00
alekseybobkov f5e47ebc88 Merge branch 'builder-ui' into develop 2016-02-04 18:00:49 -08:00
alekseybobkov bfb0fa1671 Merge branch 'develop' of github.com:octobercms/october into develop 2016-02-04 18:00:42 -08:00
alekseybobkov 241332e14a Minor style updates for the Inspector header area 2016-02-04 18:00:10 -08:00
alekseybobkov e38f7b6987 Minor fix in the tabs styles. 2016-01-30 21:01:17 -08:00
alekseybobkov 8cb5ec1c0e Fixed several minor bugs in Inspector. 2016-01-29 22:16:33 -08:00
alekseybobkov 264090fb3b Added new Inspector editor - String List Autocomplete 2016-01-26 19:53:35 -08:00
tschallacka e4b0c0fe27 Fixed static id naming primary key
RelationController forced belongs to relations to have a primary key named id.
If primary key was named differently it wouldn't register the onclick.
This fixes that by taking the primary key name from the model.
2016-01-26 14:17:18 +01:00
Jens Herlevsen 2350e30853 Make default 404 page use 404 status code 2016-01-24 19:04:22 +01:00
Amanda Tresbach adf42896da Fix negative count 2016-01-24 14:23:58 -02:00
alekseybobkov 6aef72bb87 Added "depend" parameter to the Inspector autocomplete editor. Minor fix in the Inspector. 2016-01-23 20:27:57 -08:00
Alexander Guth 17e0a2afa7 Fix doubble-applied filters 2016-01-23 17:57:08 +01:00
alekseybobkov f6dec96c86 Improved memory management in the table widget client-side scripts. Minor CSS fixes. 2016-01-22 21:43:45 -08:00
Samuel Georges af4f42e208 Add 503 header when maintenance mode enabled.
Fixes #1655
2016-01-21 20:16:53 +11:00
Tomasz Strojny e930775cf7 Added switch option translation (Polish) 2016-01-21 09:58:14 +01:00
jBOKA 00f9de9a67 German translation (Import/Export) 2016-01-20 18:05:28 +01:00
Samuel Georges 205d122dce Logic error. Fixes #1692 2016-01-19 21:03:03 +11:00
alekseybobkov 778e73964e Merge branch 'develop' of github.com:octobercms/october into develop 2016-01-17 18:55:12 -08:00
alekseybobkov 5f2e6f3306 Allow word wrap in the Inspector autocomplete editor 2016-01-17 18:55:00 -08:00
Alwin Drenth 94cbe93e8c Update Dutch language 2016-01-16 10:18:20 +11:00
Samuel Georges b21a0c453d Merge pull request #1700 from gpasztor87/develop
Minor fix in timepicker
2016-01-16 09:05:27 +11:00
Samuel Georges 43c9f63086 Merge pull request #1693 from jwilson8767/patch-3
Flash twig node now displays all messages of all types.
2016-01-16 09:03:47 +11:00
Samuel Georges d2561dcfd0 Merge pull request #1689 from CSNWEB/patch-2
Use Grammar from Query in Widget List
2016-01-16 09:02:29 +11:00
Samuel Georges 33805df3f0 Merge pull request #1677 from vojtasvoboda/patch-4
Update RequestLog.php
2016-01-16 09:01:11 +11:00
Pásztor Gábor 4af9a374d6 Minor fix in timepicker 2016-01-14 13:17:45 +01:00
Joshua Wilson d0b250c8f7 Flash twig node now displays all messages of all types.
Fixes #1225
2016-01-12 16:51:58 -05:00
Samuel Georges d8922c263f Remove global scopes for join SQL
Fixes PostgreSQL strictness
Refs https://github.com/rainlab/blog-plugin/issues/171
2016-01-12 20:53:53 +11:00
CSNWEB aa5f37aae6 Use Grammar from Query in Widget List
When using models with a different database software than the default, the old code produced a syntax error. 
Using the Grammar from the query ensures that the alias is always wrapped correctly. 

Suggestion: The code should be scanned for similar errors, produced by using DB Facade.
2016-01-10 14:10:49 +01:00
Vojta Svoboda c6113f81bd Update RequestLog.php
Truncate URL which should be maximum 255 lenght.

Reason: Today I got this error:

```
Next exception 'Illuminate\Database\QueryException' with message 'SQLSTATE[22001]: String data, right truncated: 1406 Data too long for column 'url' at row 1 (SQL: insert into `system_request_logs` (`url`, `status_code`, `count`, `updated_at`, `created_at`) values (http://www.mysite.com/docs/%C3%83%C6%92%...<too-many-chars>...%80%9A%C3%82%C2%814.pdf, 404, 1, 2016-01-02 12:16:08, 2016-01-02 12:16:08))
```
2016-01-02 12:20:19 +01:00
Samuel Georges 5a70cec7a2 Improved fix for #1672 2016-01-02 13:41:57 +11:00
Samuel Georges ecb54ff92c Rollback #1672 2016-01-02 13:40:32 +11:00
Samuel Georges f39340fc1c Merge pull request #1672 from dqsully/dqdevelop
Fix twig caching
2016-01-02 12:36:10 +11:00
Samuel Georges 188351a82a Merge pull request #1675 from gpasztor87/patch-1
Minor fix
2016-01-02 11:55:54 +11:00
Samuel Georges fa4984cbaf Minor touch up
Refs https://github.com/octobercms/october/pull/1665
2016-01-02 11:23:29 +11:00
Sergei Novikov 922cf30cb6 Fix mail subject on PHP 5.4
Check if subject set in closure

If subject setted in template, changing in closure like:

Mail::queue("template", [], function ($message) use ($subject, $email) {
	$message->subject($subject)->to($email);
});

has no effect.
2016-01-02 10:53:16 +11:00
Dave Shoreman 66413ea50b Fix permissions required for theme settings 2015-12-31 11:32:25 +00:00
Pásztor Gábor e1a9d8d393 Minor fix
It does not worked for me in popup window.
2015-12-30 19:32:14 +01:00
DQ Sully 2fae5a30b9 Fix Twig Caching
When October would load a file from its changed source, Twig would not see the message until it had gone. See Cms\Classes\Loader->isFresh. This meant a template would not update unless you deleted the Twig cache, or that template's TTL expired. Fix: add another variable (freshness) that would only change after being observed, and accurately reflected if a template's source had been modified
2015-12-28 10:09:15 -07:00
Samuel Georges 23e03aa404 Add docs for select with no search 2015-12-27 14:40:04 +11:00
alekseybobkov 7d9d2176ef Merge branch 'builder-ui' into develop
Conflicts:
	modules/system/assets/ui/js/input.monitor.js
	modules/system/assets/ui/js/inspector.editor.object.js
	modules/system/assets/ui/storm-min.js
2015-12-24 14:36:31 -08:00
alekseybobkov 747ca4357f Set default focus in popup windows, minor style fix in the flash message, minor fix in YAML-based back-end navigation initialization. 2015-12-24 14:15:02 -08:00
Samuel Georges 0164324e63 Merge pull request #1657 from gergo85/patch-1
Improve the multilingual support
2015-12-19 14:13:58 +11:00