Commit Graph

2901 Commits

Author SHA1 Message Date
Samuel Georges 5af9fcbfdc Sidebar needs to sit above dropdown overlay
This prevents the mouseout event firing and ending the entire show
Recompile assets
Fixes #2190
2016-07-23 09:42:18 +10:00
Samuel Georges 676196d304 Use starts_with instead of regex 2016-07-16 15:34:20 +10:00
Samuel Georges dbdf8f780a Merge pull request #2128 from slipgrom/develop
morphMany Relation support
2016-07-16 14:08:35 +10:00
Samuel Georges 9c12160f5d october:mirror no longer experimental 2016-07-16 13:14:59 +10:00
Samuel Georges 0a3dddf569 Merge pull request #2206 from JoelESvensson/patch-2
Escapes exception output
2016-07-16 13:13:03 +10:00
Samuel Georges c3f76ce61c Merge pull request #2207 from JoelESvensson/fix-october-mirror
Only public folder should be mirrored
2016-07-16 13:11:59 +10:00
Samuel Georges e970d80443 Align AJAX logic: merge custom response last
This is to allow overriding the standard values
Refs #2209
2016-07-16 13:11:10 +10:00
Samuel Georges 09adbbe069 Merge pull request #2209 from LukeTowers/develop
Moves AJAX handler response handling
2016-07-16 13:07:54 +10:00
Samuel Georges 346dc91d72 Merge pull request #2216 from acasar/patch-1
Pass the router reference on beforeRoute event
2016-07-16 12:53:14 +10:00
Anže Časar 68deb59265 Pass the router reference on beforeRoute event 2016-07-15 17:05:25 +02:00
Luke Towers b73811fefc Moves AJAX handler response handling
Fixes octobercms/october#2208
2016-07-13 09:51:18 -06:00
Joel E. Svensson dcfc0897fe Only public folder should be mirrored 2016-07-13 02:02:02 +02:00
Samuel Georges c8f8c5cc27 Merge pull request #2200 from mplodowski/polish-lang
Polish language update (pl)
2016-07-13 08:01:53 +10:00
Michał Płodowski bbf503f212 German datepicker translation 2016-07-11 19:55:35 +02:00
Michał Płodowski 75dbd74bca Polish language update (pl) 2016-07-11 19:34:53 +02:00
Joel Ekström Svensson 5f7b7d8c6d Escapes exception output
Fixes #2198
2016-07-11 17:32:30 +02:00
Sebastian Hilger 87cd7d8bf6 Added missing backend translations (German) (#1825)
* Added auth.title which was missing in the German language file

* Added missing backend translations to two language files

* added more German translations
2016-07-09 20:43:01 +10:00
Samuel Georges 8e4142558b Merge pull request #1741 from ARH-Digital/develop
Add morphic relations to backend
2016-07-09 20:38:21 +10:00
Samuel Georges cc28b35b07 $this is not accessible in static context
Fixes #2193
2016-07-09 05:50:01 +10:00
Michał Płodowski 7b1437d026 Fix database config parsing 2016-07-08 17:23:03 +10:00
Michał Płodowski fb7e7ff164 Command for changing configuration to env syntax 2016-07-08 17:23:03 +10:00
Aleksey Bobkov 53b8df0721 Force rich editor to synchronize when a form is saved. 2016-07-06 18:27:27 -07:00
Samuel Georges 305f20e4f9 Merge pull request #2164 from Herlevsen/danish_backend
Expose danish language in backend locale dropdown
2016-07-07 08:00:26 +10:00
Samuel Georges 3aa7afcbf2 Merge pull request #2159 from side-by-side/patch-1
Added missed russian translation
2016-07-07 07:59:59 +10:00
Samuel Georges fe3b61f802 Merge pull request #2157 from prasanth-darsan/develop
error on saving attachment config when in pivot form of a relation
2016-07-07 07:59:42 +10:00
Samuel Georges 9be8a8c0a3 Minor code tidy 2016-07-07 07:56:10 +10:00
Samuel Georges dd86a13218 Merge pull request #2140 from reg2005/patch-3
Critical bugFix in themeData.php
2016-07-07 07:54:53 +10:00
Samuel Georges b4e9325a99 Merge pull request #2137 from Cladis/master
Adding Ukrainian translation of back-end
2016-07-07 07:52:08 +10:00
Félix Desjardins 10ec9030b3 FR-CA with Canadian Flag! 2016-07-06 17:15:55 -04:00
Samuel Georges 5eab01b8bd Update composer versions
Rollback 8dd2e97cf7
2016-07-06 17:15:41 +10:00
Samuel Georges 68923d406b Update Froala to latest (2.3.3)
Recompile assets
2016-07-05 20:08:44 +10:00
Samuel Georges 4ca30f9888 Beautify saved content 2016-07-05 19:58:51 +10:00
Jens Herlevsen 40a755a6cc Expose danish language in backend locale dropdown 2016-07-03 19:36:24 +02:00
Samuel Georges 49641a31d0 Remove the dropup when there are no widgets
Fixes #2123
2016-07-03 14:53:37 +10:00
Samuel Georges 43eb8c4946 Logic error. Fixes #2154 2016-07-01 18:56:58 +10:00
Pavel ccf7a3b6e5 Added missing russian translation 2016-06-29 19:40:58 +03:00
Prasanth Darsan 6cc50b8ca8 Fixed error on saving attachment config when its put on pivot form of a relation 2016-06-28 23:17:27 +05:30
Samuel Georges b7d0c19a38 Merge pull request #2151 from freestream/fix/sv-translation
Changed and remove some english words in Swedish translation file
2016-06-27 16:44:16 +10:00
Anton Samuelsson 3a0c2c8270 Changed and remove some english words in Swedish translation file 2016-06-27 08:38:39 +02:00
Samuel Georges d8f1c0a73f Merge pull request #2126 from gustavogodoi/patch-1
Update pt-br lang
2016-06-25 10:39:54 +10:00
Samuel Georges fdb1d13ede Merge pull request #2134 from Herlevsen/danish_translation
Add danish translation
2016-06-25 10:39:33 +10:00
Samuel Georges cfb7207ae1 Clarify maintenance mode behavior
Refs https://youtu.be/JztbNGfi_Qk?t=9m38s
2016-06-24 06:48:16 +10:00
reg2005 953b92ba0a Critical bugFix in themeData.php
Additional check is added, without it there is a critical error "Call to a member function hasCustomData() on null"
2016-06-20 16:18:39 +03:00
Samuel Georges d7ef9b1738 Apply chmod rules to combiner cache 2016-06-18 09:23:16 +10:00
Jens Herlevsen be2bdb010b Add danish translation 2016-06-17 23:48:37 +02:00
Roman Gerasimov 587b8a449d morphMany Relation support 2016-06-17 10:55:03 +03:00
Samuel Georges d3b2809866 htaccess now resembles october:mirror command
Added 'resources' as a potential asset storage directory name
2016-06-17 07:09:14 +10:00
gustavogodoi 623627ce24 Update pt-br lang
Fixing typo and improving.
2016-06-16 17:25:35 +01:00
Samuel Georges 6ca828a1fa Always return an active theme and data 2016-06-16 08:01:34 +10:00
Samuel Georges a544c6822b Merge pull request #2114 from side-by-side/patch-1
Removes hardcoded "Misc" settings group translation.
2016-06-15 17:19:52 +10:00