Commit Graph

2864 Commits

Author SHA1 Message Date
alekseybobkov 96ae5d6ff3 Merge branch 'stable' into ui 2016-02-22 17:14:45 -08:00
Samuel Georges 4d113dd041 Write collision tests for sluggable
Refs #1793
Test concatenated slugs while we're here
2016-02-20 17:15:58 +11:00
Samuel Georges 202e542985 Oddly, JS may pass false as a string (@todo) 2016-02-20 17:15:21 +11:00
alekseybobkov 839eb02136 Merge branch 'stable' into ui 2016-02-19 22:13:25 -08:00
alekseybobkov a943708b99 UI updates 2016-02-19 22:12:41 -08:00
Samuel Georges da71a21172 Add oc.tableUpdateData event and readOnly to string processor
Minor tidy
2016-02-20 15:38:29 +11:00
Samuel Georges 18194fa0f9 Complete Table server data source
Recompile assets
2016-02-20 12:45:36 +11:00
Samuel Georges 87fc6f154d Include .htaccess in mirror
Fixes #1750
2016-02-20 09:16:48 +11:00
Samuel Georges 25f931d8f8 We use Selenium 1 for testing atm
Fixes #1751
2016-02-20 09:11:13 +11:00
Samuel Georges 2e819f0142 Remove deprecated method 2016-02-20 08:19:14 +11:00
Samuel Georges 54d749f034 Like setProperty(), this should not return a value 2016-02-17 17:49:52 +11:00
alekseybobkov 68aa59dae7 Updated main menu styles 2016-02-15 20:27:01 -08:00
Samuel Georges 3ee2ec86f8 Allow toolbarButtons: false 2016-02-15 17:58:59 +11:00
Samuel Georges 049e5bcfc7 Fix bad var context 2016-02-14 20:10:36 +11:00
Samuel Georges 659c7098b9 Improve dashboard performance
Dashboard widgets should defer their data requesting using AJAX so they don't kill/lag the whole page request
2016-02-14 08:19:34 +11:00
Andrew Murray 0f6a120623 Fixed typos 2016-02-13 16:55:41 +11:00
Samuel Georges c7862a84b6 Merge pull request #1754 from gpasztor87/patch-2
Add missing option to redis config.
2016-02-13 16:30:35 +11:00
Samuel Georges ea0127afcf Stripe indicator is late to the party
Fixes #1737
The AJAX events may fire before document.ready has executed, leaving $.oc.stripeLoadIndicator as null and throwing an error
2016-02-13 16:04:16 +11:00
Samuel Georges 337cf36150 Access variables as variables, not methods
Fixes #1721
Really not sure why viewBag is using the __call() magic method to access properties. Switched to using __get() + __isset() to keep everything in black and white. If this turns out to be a mistake, roll it back and ensure the reason is documented accordingly.
2016-02-13 15:26:52 +11:00
Samuel Georges 97daebfa9e Use BadMethodCallException for graceful failure (Twig only)
Fixes #1571
This also fixes method inheritance for behaviors by using parent::__call() to look for any methods provided by extensions, catches the exception, then continues with BAU
2016-02-13 15:23:53 +11:00
Samuel Georges 808c8f0ca4 Minor tidy and rollback from #1720 2016-02-13 14:41:17 +11:00
Joshua Wilson 6f3d7a58f2 Phpdoc cleanup for System\Traits
removed in WidgetMaker trait

phpdoc cleanup of backend traits and classes

Minor fix for cases when file is not found
2016-02-13 14:06:50 +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 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
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
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
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
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