3063 Commits

Author SHA1 Message Date
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
Samuel Georges
17b22dcbdf Merge pull request #1708 from gpasztor87/develop
Add extra file types
2016-02-13 13:47:58 +11:00
Samuel Georges
17717e94ec Do not send "undefined" data in ajax
Thanx @BOOMER74
2016-02-13 13:33:20 +11:00
Samuel Georges
e367febb93 Roll back some stuff from #1704 2016-02-13 13:18:48 +11:00
Alwin Drenth
386f958b6e Code improvements and added proper PhpDoc 2016-02-13 13:08:30 +11:00
Samuel Georges
6347f2bb03 Complete multilingual richeditor support
Refs #1652
2016-02-13 12:59:49 +11:00
Szabó Gergő
7fb1ed9bdb Add multilingual support to Rich editor 2016-02-13 12:08:27 +11:00
Samuel Georges
87f4cfc91f Use a dedicated hostname 2016-02-12 06:12:48 +11:00
Samuel Georges
fade9413d9 * Build 317 2016-02-11 06:16:46 +11:00
Samuel Georges
ac6ba5b4c3 Merge pull request #1766 from gpasztor87/patch-3
Add version.yaml to Demo plugin.
2016-02-11 06:14:25 +11:00
Jeferson Oliveira
6ae4742ff4 Fix hardcoded column name id by reading the keyFrom option defined in the .yaml file. 2016-02-10 08:45:21 -02:00
Samuel Georges
6d8ec9b4dc Fixes data source polluting base proto
Recompile assets
2016-02-10 20:22:50 +11:00
Samuel Georges
acfb35cbed Merge branch 'develop' into stable 2016-02-10 20:03:51 +11:00
Samuel Georges
cd055ad437 Fixes formExtendModel method so it actually works.
The extension must occur after the ::find() method, which will return a fresh object. When it occurs before, any changes to the model are lost. Where this may have prior been used to dynamically return a different model, the formCreateModelObject override method should return this value now.
2016-02-10 19:38:35 +11:00
Pásztor Gábor
eb81600e60 Add version.yaml to Demo plugin. 2016-02-10 09:14:48 +01:00
Samuel Georges
03e7c19a5d Fixes issue where twig passed null
Minor update to dropdown docs
2016-02-09 17:58:37 +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
5de725696e Merge branch 'develop' of github.com:octobercms/october into develop 2016-02-05 17:30:28 -08:00
Samuel Georges
20a6a50ee4 Merge branch 'builder-ui' into develop 2016-02-06 09:16:08 +11:00
Pásztor Gábor
f98bc30072 Add missing option to redis config. 2016-02-05 09:31:17 +01:00
Pásztor Gábor
c2b40e9049 Ignore sqlite files. 2016-02-05 09:14:30 +01: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
flynsarmy
c62eb8fb86 Remove brackets from table widget alias 2016-02-04 21:25:33 +10:00
Samuel Georges
23da8330e7 Test for detaching belongs to many after delete 2016-02-03 22:09:21 +11: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
Samuel Georges
09bbf668a6 Key must be 32 chars 2016-01-29 16:22:04 +11:00
Samuel Georges
e554586f8f Update encryption cipher in config 2016-01-29 16:15:55 +11:00
Sajjad
d2619b6ba4 Update persian language 2016-01-28 18:00:07 +03:30
Samuel Georges
eeb0d387b0 Merge pull request #1731 from gpasztor87/patch-1
Add faker to require-dev
2016-01-28 21:30:31 +11:00
Pásztor Gábor
9fc2aa42b6 Add faker to require-dev 2016-01-28 09:24:46 +01:00
alekseybobkov
264090fb3b Added new Inspector editor - String List Autocomplete 2016-01-26 19:53:35 -08:00
Samuel Georges
d00883bd8f Minor touch ups to Nullable tests 2016-01-27 08:40:23 +11:00
Samuel Georges
a8e72541e1 Merge pull request #1724 from scottbedard/stable
Add tests for Nullable trait
2016-01-27 08:05:13 +11:00
tschallacka
828006a88a deleted surplus file... somehow it didn'tget cleaned up 2016-01-26 14:22:24 +01: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
scottbedard
88f94a35d8 Add tests for Nullable trait 2016-01-24 21:39:46 -07:00
Samuel Georges
f07bd4ba4b Write tests for morphTo simple value get/set 2016-01-25 10:15:58 +11: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
Samuel Georges
a498ca49a4 Write tests for hasMany simple value get/set 2016-01-24 12:39:39 +11:00
Joel E. Svensson
ed583491e0 Fixes #1681
Added a customzied slug-function to MediaManager which supports @-signs
2016-01-23 20:36:05 +01: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