Commit Graph

67 Commits

Author SHA1 Message Date
alekseybobkov ed2ca5308b Implemented (draft) support for touch devices. Minor fixes. Reworked the proxy implementation in the base class. The Media Manager JS class now uses the base class. 2015-03-24 20:47:49 -07:00
alekseybobkov 03c46012dc Merge branch 'develop' into media-manager 2015-03-17 19:30:57 -07:00
Samuel Georges 851d421092 Update various language references 2015-03-16 19:33:58 +11:00
Samuel Georges 77d3ab8b67 Finish basic theme utilities: properties, import/export, duplicate, delete 2015-03-16 19:00:39 +11:00
alekseybobkov 44c08b76f9 Implemented file uploading 2015-03-15 21:54:39 -07:00
alekseybobkov 78ad303236 Merge branch 'develop' into media-manager
Conflicts:
	composer.json
	modules/backend/assets/css/october.css
	modules/backend/assets/less/controls/lists.less
	modules/backend/assets/less/october.less
	modules/backend/widgets/Form.php
	modules/backend/widgets/form/partials/_field.htm
2015-03-15 13:06:50 -07:00
alekseybobkov 18e058ad59 Added the Media tab, minor update in .htaccess to allow temporary public directory to be accessible; implemented the basic UI components and navigation; implemented grid, list and tiles view modes; implemented drag-select interface; implemented Media Library cache refreshing; implemented thumbnail generating for local and remote media files; fixed memory leak in third-party Flot Resize library; minor update in the AJAX framework - AJAX request cancelling is not considered as an error anymore; added back-end UI components for creating panels. 2015-03-15 12:52:03 -07:00
Samuel Georges 9b8e1ce3c1 Improve theme list to allow editing properties 2015-03-14 18:09:54 +11:00
Pásztor Gábor 12bfc52941 Emmet support for Codeeditor 2015-02-18 20:54:36 +01:00
Samuel Georges f2460cb7b8 Fixes issue where snippet data (viewBag) is not saved
^- when there are no components used on the partial
+ Minor lang fix
2015-02-14 17:27:27 +11:00
Samuel Georges 49641c224d Merge pull request #925 from SaifurRahmanMohsin/patch-2
Added lang instead of plain text
2015-02-12 08:30:16 +11:00
Samuel Georges 0a6e14f4d2 Popup control now supports several sizes via `data-size` attribute: giant, huge, large, small, tiny.
Fixes various bugs in RC version
2015-02-11 14:36:00 +11:00
Samuel Georges 9d649ebb1e Remove deprecated path symbols 2015-02-07 16:20:34 +11:00
Saifur Rahman Mohsin 922815cc6c Added lang instead of plain text 2015-02-03 10:25:21 +05:30
Samuel Georges b1b700368f Radical reorg of some classes 2015-01-28 11:49:54 +11:00
alekseybobkov c26545913c Improvements in the table widget, added new events to the CMS core, form styling, added support for the Table widget in in the CMS area. 2015-01-07 22:21:52 -08:00
alekseybobkov 3ac21e3c89 Merge branch 'develop' into table-widget 2014-12-17 22:15:23 -08:00
Samuel Georges 2533b4ab4d ThemeData now applies default values, Theme object will proxy to ThemeData 2014-12-05 16:45:20 +11:00
Samuel Georges 70eb7eaf51 Adds Theme customization feature
Adds reset button to settings pages
authorUrl -> homepage
2014-12-04 16:49:52 +11:00
Samuel Georges 001e86456d Fixes #788 - Fall back to config theme when db theme fails. 2014-11-23 03:40:04 +11:00
alekseybobkov ba32d9a1bf Merge branch 'develop' into viewbag-unification 2014-11-11 11:43:12 -08:00
Sam Georges 98e100b377 Refs #729 - Fixes CMS permissions, should not show "pages" content by default 2014-11-09 12:35:10 +11:00
alekseybobkov 802f96f10e Refactoring of the view bag support code 2014-11-03 20:50:18 -08:00
Sam Georges c83797231d Subsequent expressions are on a new line (see developer guide > PSR exceptions) 2014-11-01 12:00:45 +11:00
Sam Georges ac37d23d14 Tidy up code a lil 2014-10-30 16:54:56 +11:00
alekseybobkov 9a05a408c9 Added support for components in partials 2014-10-29 22:12:42 -07:00
Stefan Talen 347dff7e75 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
	modules/backend/behaviors/RelationController.php
	modules/backend/classes/WidgetManager.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/twig/Extension.php
	modules/cms/twig/PlaceholderNode.php
	modules/cms/widgets/TemplateList.php
2014-10-18 11:07:17 +02:00
Sam Georges ed552f1591 Minor code clean 2014-10-18 15:52:44 +11:00
Sam Georges 8ee28b214d Minor code clean 2014-10-18 14:32:06 +11:00
Stefan Talen 06890d711a Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
	modules/backend/behaviors/UserPreferencesModel.php
	modules/cms/classes/Controller.php
	modules/system/classes/CombineAssets.php
2014-10-16 18:44:18 +02:00
Sam Georges 9f5646d273 BackendSettings -> BrandSettings
pageTitle is now translated at the end of the line
Fixed unit tests so they pass
SettingsModels are now cached
2014-10-15 19:53:44 +11:00
Stefan Talen e9ce6f5d54 Updating modules/cms/controllers 2014-10-11 01:27:52 +02:00
Sam Georges 17f282b126 Removes deprecated code 2014-09-29 10:01:28 +10:00
alekseybobkov 6b42055184 Fixes in the rich editor, improved the content block rendering code, minor fixes in the popover and form styling. 2014-09-27 23:28:38 -07:00
alekseybobkov df55946b61 Merge branch 'misc-tmp' into develop 2014-09-03 20:01:17 -07:00
alekseybobkov 9572c17253 Minor changes in the back-end UI. The front-end router now triggers an event allowing to override the default routes. The CMS back-end UI now supports view bags in content files. 2014-09-03 19:58:21 -07:00
Sam Georges 8c07bfea15 Tokens expand when holding CTRL and double clicking (Yay!) 2014-08-30 16:21:16 +10:00
Sam Georges 357475c992 Token Breaker -> Token Expander, Add token expander to CMS editor 2014-08-30 16:05:19 +10:00
Sam Georges e55d4f9ea0 Performance improvement: CMS was passing all assets with each AJAX call
Add token breaker plugin to CMS page
2014-08-30 15:04:15 +10:00
Sam Georges d2e2e1ffff Local events also don't need prefixes 2014-08-19 21:34:59 +10:00
Sam Georges 7bd967cff5 Fix cms.template.save event, should always pass the primary object as the first/second parameter.
This may be a breaking change for some, sorry about that.
2014-08-19 21:33:03 +10:00
Sam Georges 7ccf5fe5db Fix Save / Preview icons in the CMS
Change preview site icon to icon-crosshairs
2014-08-05 17:10:38 +10:00
Sam Georges 6388ecef52 private -> protected 2014-08-01 13:58:59 +10:00
alekseybobkov 241e174ab4 Merge branch 'develop' into ux 2014-07-27 11:11:56 +11:00
Sam Georges e6379ea21d Fixes bug when deleting cms templates 2014-07-25 18:11:16 +10:00
alekseybobkov 98eb3e2e84 System page navigation improvements, not finished 2014-07-24 15:19:00 +11:00
Sam Georges bef95920e2 YAML fields should be camel for PHP friendliness 2014-07-19 16:19:07 +10:00
Sam Georges 3c11249bef Add notes to changelog, controllers should use plural naming 2014-07-19 16:14:46 +10:00
Sam Georges a43f4f6b51 Use Parameters model instead of raw DB 2014-07-19 16:07:32 +10:00
Sam Georges 04888b2b93 Minor 2014-07-19 15:54:09 +10:00