TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,462 Commits 3 Branches 0 Tags 78 MiB
Commit Graph

603 Commits

Author SHA1 Message Date
Samuel Georges 8e69039c0d Adds folder support for making partials 2015-04-14 22:17:10 +10:00
alekseybobkov 06e5dce96a Fixed a conflict in framework.js. Closures in the script are named now, for the memory profiling needs. 
Conflicts:
	modules/system/assets/js/framework.js
 2015-04-11 18:58:24 -07:00
alekseybobkov c1740c479c Media Manager: implemented insert link, insert image, and crop and insert features. Minor fixes in October core and third-party JS plugins. 2015-04-11 18:55:02 -07:00
Samuel Georges 297ac65ce6 Alternative fix to #1050 2015-04-11 10:59:27 +10:00
Samuel Georges f4cb5ab8f1 Merge pull request #1050 from keiosweb/fix_getComponentProperties_method 
fixes getComponentProperties foreach iteration overriding method argument name
 2015-04-11 10:56:44 +10:00
Samuel Georges 5da198ccd8 Merge remote-tracking branch 'remotes/tresbach/develop' into develop 
Conflicts:
	modules/system/lang/pt-br/lang.php
	modules/system/lang/pt-br/validation.php
 2015-04-11 10:53:37 +10:00
Samuel Georges d283d6b143 Merge remote-tracking branch 'remotes/krisawzm/develop' into develop 
Conflicts:
	modules/backend/models/BackendPreferences.php
	modules/system/lang/ru/lang.php
	modules/system/lang/sv/lang.php
 2015-04-11 10:48:59 +10:00
Samuel Georges 0b6587f771 Fixes #1019 - prevents lock out of full screen mode 
Reorder system setting items
 2015-04-09 20:20:08 +10:00
Samuel Georges 0f630c80d9 Improve framework code to support $(this) in data attributes 2015-04-08 07:44:26 +10:00
Łukasz Biały 4212386b37 fixes iteration overriding argument name, caused bug where properties of another component where returned if cache was empty 2015-04-07 13:12:20 +02:00
alekseybobkov 790b464679 Merge branch 'develop' into media-manager 2015-04-04 19:01:08 -07:00
alekseybobkov 332d92f538 Implemented image inserting to Redactor. 2015-04-04 18:59:36 -07:00
Samuel Georges c54821f175 Overhaul the plugin installation process in the back-end 
Themes can now be installed via the back-end
 2015-04-04 17:28:51 +11:00
Samuel Georges 9d4bc8eee6 Create withComponent() filter for CmsObjects 2015-04-04 10:34:25 +11:00
Samuel Georges 31f598237a Merge pull request #1039 from freestream/swedish-lang-improvements 
Improved and added missing Swedish translation
 2015-04-01 19:04:40 +11:00
alekseybobkov 9ed3d03484 jQuery in the back-end updated to v.2.1.3. Fixed several memory management issues in select2 (an event attached to the mask element is never unbound), framework.js (onunload event attached to window is never unbound and holds references to the Request instances). Added popup adaptive size option. Started media manager popup API. 2015-03-29 18:56:06 -07:00
Anton Samuelsson 7d8237fe30 Added swedish language for module 'cms' 2015-03-29 16:00:01 +00:00
Denis Malinochkin 8852c2e29e Fix typo 2015-03-29 16:43:15 +03:00
Denis Malinochkin 5d5fc93d32 Translate -> Module -> CMS 2015-03-29 13:01:35 +03:00
alekseybobkov 16cb546f30 Tested and fixing the Media Manager dispose() method. Minor fixes in the DragScroll and Toolbar controls (memory management). 2015-03-28 17:18:07 -07:00
alekseybobkov c299e3a7e7 Performance improvements in Media Manager drag-select implementation. 2015-03-28 13:36:01 -07:00
alekseybobkov f6cf7e9840 Added new back-end control Scrollpad. Added Element and Event utility functions to the Foundation library. Implemented file list scrolling in the Media Manager. Some minor fixes. 2015-03-28 11:42:40 -07:00
alekseybobkov 5731ad0db7 Merge branch 'develop' into media-manager 2015-03-26 18:37:24 -07:00
krisawzm 5d79be79eb Added Norwegian language support 2015-03-26 23:16:29 +01:00
krisawzm 4c723ac48f Another typo 2015-03-26 22:31:21 +01:00
Samuel Georges 5503705576 Define more backend permissions 
Addresses some of the concerns raised in #218 (fixes #218)
 2015-03-26 21:56:04 +11:00
Amanda Tresbach 897d291b78 Improve and update Brazilian files 2015-03-25 17:03:57 -03:00
Samuel Georges 15a016a338 Disable route persistence for static menus 2015-03-25 19:34:09 +11:00
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
刘星 4044911057 Update Chinese language 2015-03-24 12:42:35 +08:00
alekseybobkov 1e5c34b702 Added the empty Library message. 2015-03-22 22:37:51 -07:00
alekseybobkov 695c5d243b Implemented the hide/show sidebar feature 2015-03-22 14:56:08 -07:00
alekseybobkov 86b9f58465 Implemented folder and file moving. 2015-03-22 13:07:37 -07:00
alekseybobkov f7d08f1197 Implemented folder creation, fixed a minor issue with selecting items, added a new event to the Popup control. 2015-03-21 23:09:33 -07:00
alekseybobkov cd0b107a2b Implemented file and folder renaming 2015-03-21 16:14:26 -07:00
alekseybobkov 331276c244 Implemented file and folder deletion 2015-03-18 22:20:53 -07:00
alekseybobkov e2a9c25b65 Implemented search. 2015-03-17 22:20:04 -07:00
alekseybobkov 03c46012dc Merge branch 'develop' into media-manager 2015-03-17 19:30:57 -07:00
Samuel Georges 5648507e0c Adds soft copy directory support, minor fix to loadindicator 2015-03-18 05:38:25 +11:00
alekseybobkov 4e1217e2de Implemented item sorting. Minor fix in the drop-down list styling. 2015-03-16 21:49:39 -07:00
alekseybobkov a040fa4c68 Implemented file type filters 2015-03-16 20:32:51 -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 e86a463e49 Disabled thumbnail generating in the uploader 2015-03-15 22:24:47 -07:00
alekseybobkov 64e3b77eae Minor fix 2015-03-15 22:06:52 -07: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
Samuel Georges 61022d3961 Merge branch 'master' of github.com:octobercms/october 2015-03-14 11:22:16 +11:00
Samuel Georges 68819ef476 Merge pull request #1000 from masnug/lang-id 
Bahasa Indonesia
 2015-03-14 11:19:00 +11:00
Samuel Georges 203e4edc0b Minor touch ups 2015-03-13 22:15:43 +11:00
Samuel Georges a8389fb1aa Tooltip now auto initializes 
initForm can now pass context
Various improvements and bug fixes
 2015-03-12 20:50:16 +11:00
Wuri Nugrahadi fb180a748c Add Bahasa Indonesia (OC *222) 2015-03-12 13:37:12 +07:00
Samuel Georges fbe755c119 Use fallback when routes are not registered for pageUrl() 
pageUrl() also no longer supports $absolute (arg 3)
 2015-03-11 19:15:54 +11:00
Samuel Georges 682dbe4b95 Refactor CMS Controller, can now have ::render() called from the outside 2015-03-11 08:34:25 +11:00
Samuel Georges a324f01678 CmsCompoundObject::hasComponent() now resolves registered codes for comparison 2015-03-07 20:28:17 +11:00
Samuel Georges 40f08ad3db Merge pull request #975 from gergo85/master 
Updated Hungarian language
 2015-03-07 13:20:51 +11:00
Samuel Georges ff0ca0ef6f Merge pull request #988 from keiosweb/develop 
Polish translation fixes
 2015-03-07 11:31:16 +11:00
Samuel Georges ec14cd6bee Updates for new input preset /form field API 2015-03-07 11:20:54 +11:00
Samuel Georges 477ce7bbc7 Lil tidy up 2015-03-07 10:47:38 +11:00
Kuba f3f21fdf83 Polish translation fixes 2015-03-06 23:07:52 +01:00
Samuel Georges a3f3084924 Implement AjaxException 2015-03-03 18:41:09 +11:00
Samuel Georges 92b533d962 Tidy up 2015-03-03 08:49:31 +11:00
gergo85 157dc0c76f Updated Hungarian language 2015-03-01 10:29:47 +01:00
retep007 09ac22918f Added initial Slovak language mutation 2015-02-28 10:14:20 +01:00
Samuel Georges e487f075c4 Fixes issue in CodeParser where it tries to use a class that doesn't exist 
Adds context to filterFields() model override
 2015-02-26 23:08:38 +11:00
alekseybobkov 1c273f28ba Implementing the MediaLibrary class, in progress 2015-02-24 22:02:03 -08:00
Samuel Georges 5b758e0d4c Merge pull request #950 from gpasztor87/master 
Emmet support for Codeeditor
 2015-02-21 15:05:44 +11:00
Samuel Georges 1277364d4c Fixes #916 2015-02-21 14:58:51 +11:00
Pásztor Gábor 12bfc52941 Emmet support for Codeeditor 2015-02-18 20:54:36 +01:00
Samuel Georges 7145aac457 Prepare for CDN, config rename cms.plugins|themes|uploadsDir -> cms.plugins|themes|uploadsPath 
Deprecate data-trigger-type on triggerapi
Fixes ref to Util class
 2015-02-17 20:58:38 +11:00
Samuel Georges 7b52e07b65 Overhaul exceptions, rename triggerapi display -> show 2015-02-16 21:16:43 +11: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 9927568d98 Removed the deprecated propertyOrParam() 2015-02-14 16:31:56 +11:00
Samuel Georges a2f2f5f87f Component->paramName() was not functioning as described 
{{ :param }} returned null, should return "param"
 2015-02-14 15:52:58 +11:00
Samuel Georges 6a2f64757b *** REMOVED ALL DEPRECATED CODE ** 2015-02-14 14:11:25 +11:00
Samuel Georges 3d04f06ad1 Various fixes 2015-02-12 21:04:05 +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 f6371d532b Fixes unit tests 2015-02-10 17:45:27 +11:00
Samuel Georges 610ea932fc Fixes #856 - Implement a linking policy, defaults to relative 2015-02-09 21:52:17 +11:00
Samuel Georges 9d649ebb1e Remove deprecated path symbols 2015-02-07 16:20:34 +11:00
Samuel Georges fbf46519b4 Implement plugins_path() usage 2015-02-07 15:37:07 +11:00
Samuel Georges 9a616b6174 Fix clear cache, update storage paths 2015-02-07 14:50:03 +11:00
Samuel Georges 4c29c5080d Clean up, get front and backends operational again 2015-02-05 19:47:20 +11:00
Samuel Georges 899100919d Rewrite all implementations of remember() on models 2015-02-04 19:52:59 +11:00
Samuel Georges beb818efa5 Merge branch 'develop' into laravel5 
Conflicts:
	modules/cms/classes/CmsCompoundObject.php
	modules/system/ServiceProvider.php
 2015-02-04 19:35:55 +11:00
Saifur Rahman Mohsin 922815cc6c Added lang instead of plain text 2015-02-03 10:25:21 +05:30
Samuel Georges ab128301e8 Minor 2015-02-02 00:24:05 +11:00
Samuel Georges 8ab39cb424 Minor 2015-02-01 23:56:27 +11:00
Samuel Georges b915c2003c Merge pull request #904 from gergo85/master 
Minor cleanup
 2015-01-31 14:28:05 +11:00
Samuel Georges 393c900342 Refs #900 - Add polish language 2015-01-31 14:26:45 +11:00
Samuel Georges 709070439d Merge pull request #914 from jumilla/patch-cms 
Change sort by fileName on cms template directory list.
 2015-01-31 14:09:07 +11:00
Samuel Georges b1b700368f Radical reorg of some classes 2015-01-28 11:49:54 +11:00
Fumio Furukawa 11522d1010 Change sort by fileName on cms template directory list. 2015-01-27 17:25:29 +09:00
Fumio Furukawa 77a4e49892 Update translation for Japanese. 2015-01-27 02:46:30 +09:00
Samuel Georges c1c733769f Merge pull request #903 from jtherczeg/develop 
Corrections and updates for Build 182
 2015-01-25 13:20:29 +11:00
Samuel Georges 1e0a890efb Fixes #898 - Manually added translations 2015-01-25 13:14:31 +11:00
gergo85 c65b7a6b8e Minor cleanup 2015-01-22 09:06:30 +01:00
alekseybobkov e7e50bc684 Merge branch 'develop' of github.com:octobercms/october into develop 2015-01-21 21:39:03 -08:00
alekseybobkov cc23b434cb Minor improvements in the CMS API 2015-01-21 21:38:42 -08:00
jtherczeg 831ff79c47 Corrections and updates for Build 182 2015-01-21 18:32:23 +01:00
Samuel Georges 9c4b2d690b Tidy up event 2015-01-21 22:03:52 +11:00
Samuel Georges f24d9ab3d3 Turns out this event was used, added it back with proper args 2015-01-21 21:41:09 +11:00
alekseybobkov d850a795fd Minor updates in the components API and Inspector 2015-01-20 19:38:02 -08:00
alekseybobkov 1dd2248717 Merge branch 'develop' of github.com:octobercms/october into develop 2015-01-18 19:20:46 -08:00
alekseybobkov 8ff242c1d0 Fixed default options support in Inspector, minor improvement in the components API. 2015-01-18 19:20:33 -08:00
Samuel Georges 7b4a419241 Not sure this event is used anywhere, it has improper implementation (missing $result from passed arguments) 2015-01-18 16:00:38 +11:00
Samuel Georges 2bf0084796 * Build 180 - Use less situational event names. @ping alekseybobkov 2015-01-18 15:59:44 +11:00
jtherczeg a629c46c69 Updates for Build 178 
Hungarian language files updated for Build 178
 2015-01-16 15:00:40 +01:00
alekseybobkov 433e99d6e7 Fixed a bug with closing tabs in the CMS 2015-01-12 22:23:13 -08:00
Samuel Georges 7e7d77c5e6 Fixes #869 - Constructor doesn't have static. ping @alekseybobkov 2015-01-12 20:08:52 +11:00
Samuel Georges ddaceb5ad7 Merge pull request #875 from scottbedard/patch-2 
Adds isHidden check to backend components widget
 2015-01-10 10:52:41 +11:00
Samuel Georges aa11693117 Merge pull request #867 from mahony0/patch-2 
Update lang.php
 2015-01-10 10:41:51 +11:00
Scott Bedard 3ca540ac61 Adds isHidden check to backend components widget 
Allows components to be hidden from the backend components widget by checking their isHidden value
https://github.com/octobercms/october/blob/master/modules/cms/classes/ComponentBase.php#L41
 2015-01-08 09:42:41 -05:00
alekseybobkov e1ebfac575 Merge branch 'develop' of github.com:octobercms/october into develop 2015-01-07 22:22:38 -08: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
Mahmut d1676ae8ad Update lang.php 
Added translate for unconverted strings and some of them optimized for successful converting.
 2015-01-05 21:58:06 +02:00
Samuel Georges 9ea6940e6a Add {{ this.session }} 2015-01-05 21:08:30 +11:00
Samuel Georges b08020fd4c Update CHANGELOG 2015-01-05 15:02:22 +11:00
Samuel Georges 55a68be13b Check for the presence of validation errors in the session, and add it to the view 2015-01-05 14:57:17 +11:00
Samuel Georges 415f07eb1d Fixes various unit tests so they pass (Tested in Windows) 2015-01-05 12:37:04 +11:00
Samuel Georges 59c9146b4f Merge pull request #861 from gergo85/master 
Cleanup
 2015-01-05 09:21:09 +11:00
alekseybobkov 7e5ce04a79 Merge branch 'develop' into dynamic-partials 2015-01-03 16:41:25 -08:00
alekseybobkov 6440b718d8 Updates in the rich editor styling, minor improvements in the Inspector and CMS core. 2015-01-03 16:39:38 -08:00
gergo85 f0005d196b Cleanup 
Remove whitespaces.
 2015-01-03 12:41:23 +01:00
Samuel Georges 8f8ac2dd02 Merge pull request #860 from gergo85/master 
Improve multilanguage support and cleanup
 2015-01-03 15:56:09 +11:00
Samuel Georges df3e66246f Fixes #839 - When rendering partials from component PHP code, be firm about the context 2015-01-03 15:15:57 +11:00
Samuel Georges fa250927d0 New events for components: runAjaxHandler + beforeRunAjaxHandler 2015-01-03 12:51:09 +11:00
Samuel Georges 03bf0c8206 These are useful helpers, make them public 2015-01-03 12:33:32 +11:00
jtherczeg 242bac4ce8 Hungarian language files updated 
Hungarian translations updated for the latest build, some corrections
made.
 2014-12-22 19:06:15 +01:00
gergo85 c43680b2ef Improve multilanguage support and cleanup 2014-12-19 10:28:27 +01:00
alekseybobkov 3ac21e3c89 Merge branch 'develop' into table-widget 2014-12-17 22:15:23 -08:00
Samuel Georges 3170dd61ea Add new methods propertyName() and paramName() to Component base class for accessing names of external properties. 2014-12-16 15:41:50 +11:00
Samuel Georges b95eb5b342 setComponentPropertiesFromParameters -> setComponentPropertiesFromParams 2014-12-16 15:18:36 +11:00
Samuel Georges a03d0cc8b4 showExternalParameter -> showExternalParam 2014-12-16 15:16:31 +11:00
Samuel Georges 2583a6be6d Merge pull request #832 from andreas-bergstrom/patch-1 
Grammar and spelling
 2014-12-16 12:46:25 +11:00
Samuel Georges d3000ca51a Unify the handling of detailed exception messages 2014-12-16 12:21:55 +11:00
Andreas Bergström a608a1c5e3 Update lang.php 2014-12-15 08:17:19 +07:00
Andreas Bergström 149f1c7632 Grammar and spelling 
Improved grammar and corrected spelling.
 2014-12-15 08:16:25 +07:00
Samuel Georges daee5f27c2 Merge pull request #821 from mrmlnc/develop 
Clean key & Update Ru lang
 2014-12-14 09:44:53 +11:00
Samuel Georges 9f8eb58591 Fixes bug where setting statusCode doesn't work for AJAX handlers 2014-12-08 19:01:27 +11:00
Denis Malinochkin ee5bc8407c Clean key & Update Ru lang 2014-12-08 03:51:39 +03:00
Samuel Georges 33be75af10 Config item `cms.customErrorPage` is deprecated, the setting `app.debug` should be used instead. 2014-12-06 13:22:57 +11:00
Samuel Georges 7a289e63a2 Merge pull request #800 from gergo85/master 
Optimized images and update jQuery
 2014-12-06 09:28:01 +11: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 88ac73d221 Throw AppExceptions so they are not logged 2014-12-05 08:46:57 +11:00
jtherczeg 9dcbe89247 Hungarian translations updated 
The Hungarian module translations updated for the latest OctoberCMS
build.
 2014-12-04 09:51:05 +01:00
Samuel Georges 70eb7eaf51 Adds Theme customization feature 
Adds reset button to settings pages
authorUrl -> homepage
 2014-12-04 16:49:52 +11:00
gergo85 f4b9cbfca3 Optimized images 
All images optimalized via PNGGauntlet. The image quality unchanged, but
the files became smaller.
 2014-12-01 12:20:04 +01:00
Samuel Georges bb18230f46 Refs #792 - Fixes logic error 2014-11-26 17:31:07 +11:00
Samuel Georges 49f5b23e31 Refs #792: Improve 'cms.page.beforeDisplay' event to support modifying the page, clean up events 2014-11-26 17:29:04 +11:00
Samuel Georges 001e86456d Fixes #788 - Fall back to config theme when db theme fails. 2014-11-23 03:40:04 +11:00
Samuel Georges 0c812a59e5 Merge pull request #782 from webmaxx/develop 
Added new symbols to page slug regexp in the backend.
 2014-11-19 20:53:34 +11:00
webmaxx b4819e73b3 Added new symbols to page slug regexp in the backend. 
Example slug:
/news/:page?|^[0-9]+$ - "/news/", "/news/2"
 2014-11-19 12:04:55 +04:00
Samuel Georges b6ec6ccf2c Pass mtime to menu resolving method results 2014-11-19 17:46:26 +11:00
Samuel Georges f351697c48 Streamline Theme object API (::load should be static as in CmsObject) 2014-11-19 17:45:57 +11:00
Dan Herd 352ff5e502 Fix 'File was changed' modal so 'Reload' and 'Save' buttons actually work. 2014-11-12 14:28:34 +00:00
alekseybobkov ba32d9a1bf Merge branch 'develop' into viewbag-unification 2014-11-11 11:43:12 -08:00
jtherczeg b5fd93d882 Hungarian language files updated for Build 162 2014-11-10 17:18:15 +01:00
Sam Georges ba166a0cf9 Add counter labels and maintenance settings page to Cms provider + Language files, update CHANGELOG.md with changes 2014-11-10 20:35:20 +11:00
Sam Georges cfaf3228d9 Fixes #9 - Adds maintenance mode setting to the CMS 2014-11-10 20:34:42 +11:00
Sam Georges cbf49e294f Fixes #11 - Template search now puts priority on "exact" match over "fuzzy" 2014-11-10 20:32:25 +11:00
Sam Georges 333306e6ad Remove rogue space 2014-11-09 15:22:03 +11: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 7357954c84 Proposed fix for handling defaults when parsing external properties 2014-11-04 12:33:38 +11:00
jtherczeg bb25a1a82c Hungarian language files for modules committed 2014-11-03 09:41:09 +01: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 03e9f48333 Deprecate propertyOrParam 2014-10-31 20:01:17 +11:00
Sam Georges afcf50a585 noExternalParameter -> showExternalParameter 2014-10-31 19:57:07 +11:00
Sam Georges ac37d23d14 Tidy up code a lil 2014-10-30 16:54:56 +11:00
alekseybobkov 2a771190ea Merge branch 'develop' into dynamic-partials 2014-10-29 22:14:31 -07:00
alekseybobkov 9a05a408c9 Added support for components in partials 2014-10-29 22:12:42 -07:00
Samuel Georges ecf84b48e1 Merge pull request #723 from alvaro-canepa/patch-1 
Add Spanish language support
 2014-10-27 19:07:10 +11:00
alvaro.canepa d9c06c9ed5 Spanish language support 2014-10-24 23:02:38 -02:00
Sam Georges a00cb9f556 (7:15:01 PM) Flynsarmy: i feel component should also show the subheader too 2014-10-24 19:17:21 +11:00
Sam Georges 7cb8bf0d9a Improve code a tiny bit 2014-10-24 19:11:44 +11:00
Sam Georges 688d8c95de Comply PSR 2014-10-24 19:01:30 +11:00
Sam Georges 38f8aab27c Comply PSR 2014-10-24 19:00:44 +11:00
flynsarmy f869c7d268 Make dump show object type 2014-10-23 20:32:55 +10:00
Sam Georges 4ac6469200 Original data does not exist for new objects 2014-10-23 08:11:11 +11:00
Sam Georges 59ba8af24b Go back to old icons 2014-10-22 14:24:31 +11:00
Sam Georges 578f1c0945 Update icons 2014-10-22 14:15:21 +11:00
Sam Georges a9eecfecd5 Remove blueimp uploader, replaced with dropzone.js 2014-10-20 18:55:31 +11:00
Sam Georges 23f6d75416 Peer review of #679 2014-10-19 10:58:18 +11:00
Stefan Talen 509e7d2a12 Fixing issues with files in modules/cms 2014-10-18 12:03:48 +02: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
alekseybobkov d4bc164fb2 Display the default placeholder content if there is no put tag for the placeholder 2014-10-16 22:36:00 -07:00
alekseybobkov 219f1ff8f7 Merge branch 'develop' into static-pages-support 
Conflicts:
	modules/backend/assets/less/controls/filelist.less
 2014-10-16 21:03:20 -07:00
alekseybobkov 12175b29db Multiple updates in the back-end widgets and styles 2014-10-16 20:47:23 -07: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
Sam Georges 57ec5c7261 Moved asset combiner to the system module 2014-10-15 08:09:46 +11:00
Stefan Talen acf2304ce2 Fixing test SectionParserTest::testParseOffset 2014-10-12 14:23:47 +02:00
Stefan Talen 230a7377cf Updating files in modules/cms 2014-10-11 14:33:40 +02:00
Stefan Talen 61cf1ad710 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 
Conflicts:
	modules/backend/behaviors/FormController.php
	modules/backend/classes/AuthManager.php
	modules/backend/lang/fa/lang.php
	modules/backend/widgets/Form.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/classes/ComponentHelpers.php
	modules/cms/formwidgets/Components.php
 2014-10-11 11:58:20 +02:00