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

125 Commits

Author SHA1 Message Date
Sam Georges a9eecfecd5 Remove blueimp uploader, replaced with dropzone.js 2014-10-20 18:55:31 +11:00
Stefan Talen 0a05e08a38 Fixing issues with files in modules/backend 2014-10-18 12:05:51 +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
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
Dmitriy d055bbedaa Rename Datepicker.php to DatePicker.php 2014-10-16 22:03:10 +03: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 d194f34cf8 Merge branch 'develop' into customize-backend 2014-10-13 18:35:39 +11:00
Stefan Talen f29151100b Updating modules/backend/formwidgets 2014-10-10 23:50:05 +02:00
alekseybobkov 799af7a3b3 Merge branch 'develop' into static-pages-support 2014-10-05 22:46:08 -07:00
alekseybobkov 335506be53 Minor updates in the RichEditor widget styling 2014-10-05 22:39:39 -07:00
alekseybobkov 26e8d5bda5 Minor updates in the back-end UI 2014-10-05 22:21:03 -07:00
Sam Georges eb886af176 Bug fixes 2014-10-04 13:31:04 +10:00
Sam Georges be5ba5dd7b Update redactor to v10 2014-10-04 13:16:29 +10:00
Sam Georges 79fd2e2afe Adds colorpicker form widget, add initial form for customizing backend 2014-10-03 18:01:37 +10:00
Sam Georges fee5925246 Revert image plugin until completed 2014-10-03 17:59:18 +10:00
alekseybobkov a534f7bc79 Fixes in the Richeditor styling. Implemented parsed content caching for content blocks. 2014-09-29 22:58:30 -07:00
alekseybobkov dcf7bb7d4f Merge branch 'develop' into misc-tmp 2014-09-27 23:29:41 -07: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
Sam Georges bdb3d5ff45 Remove hard coded key name ref 2014-09-25 18:35:10 +10:00
Sam Georges 746f425d88 Added new containerAttributes property to form fields 2014-09-25 18:05:35 +10:00
Sam Georges 5f12d9fc9b Keep relation constraints in Relation form widget 2014-09-23 07:56:15 +10:00
Sam Georges 49117a2732 Minor 2014-09-20 16:56:11 +10:00
Sam Georges feb409c8c6 Add text to empty figure captions 2014-09-20 16:53:26 +10:00
Sam Georges 334725594a Add image toolbar button 2014-09-20 16:47:52 +10:00
Sam Georges 12b8e07aa2 Add table plugins, isolate WYSIWYG classes to OC prefix, add front end defaults 2014-09-20 15:46:50 +10:00
Sam Georges d27eed4e15 Bug fix 2014-09-20 13:25:09 +10:00
alekseybobkov 632d1b82cf Fixed Redactor styles 2014-09-18 20:30:45 -07:00
alekseybobkov e383f0bd01 Fixes in the Redactor styling 2014-09-18 20:03:59 -07:00
Sam Georges d31f2eb97e Create custom redactor stylesheet, add figure and quote redactor plugins. So v. cool! :-) 
This will break the stretch implementation, since we no longer using iframe. Att: @alekseybobkov
 2014-09-18 19:20:47 +10:00
Sam Georges 3007cc6e0a Rich editor should use a data locker so fullscreen does not pull textarea out of the form element. Add cleanup plugin. 2014-09-18 15:18:05 +10:00
Sam Georges e7e518adf8 Rich Editor no longer uses iframe or individual stylesheet, adds fullscreen button 2014-09-18 14:48:21 +10:00
Sam Georges 4f00fbdbc6 Minor. keyField -> keyFrom 2014-09-17 16:47:55 +10:00
Sam Georges c8f3c640b8 columnName -> fieldName + general improvements to FormWidgetBase 2014-09-17 16:07:06 +10:00
Sam Georges fdb90d3882 nameColumn -> nameFrom 2014-09-17 14:00:10 +10:00
Sam Georges 109df00340 nameColumn -> nameFrom 
descriptionColumn -> descriptionFrom
 2014-09-17 13:39:37 +10:00
Sam Georges b8fbb073ac Minor 2014-09-14 10:57:58 +10:00
Sam Georges 277a2daf7b Improvements to rich editor 2014-09-13 14:09:48 +10:00
Sam Georges c2a71e88bb Clean up some sloppy work 2014-09-12 20:20:52 +10:00
Sam Georges 8291dbf4d3 Widgets can now state that they contribute no data when the form is saved 
Applied to FileUpload.php
 2014-09-06 22:22:59 +10:00
Sam Georges f3c6260c3e Slightly different fix to #580. Closes #580 2014-09-06 22:02:56 +10:00
Sam Georges 91a7ea9da2 Minor code improvements 2014-09-06 21:46:19 +10:00
Samuel Georges fa0ada51c6 Merge pull request #579 from Flynsarmy/nestedFileUpload 
Refs #485, #504 - Allow adding nested FileUpload files
 2014-09-06 21:40:49 +10:00
Sam Georges 347e25babc Add search capability to manage mode (lists) 2014-09-06 13:18:55 +10:00
alekseybobkov b69f7b649e Fixes the source editor in the Redactor. 2014-09-04 20:18:29 -07:00
alekseybobkov df55946b61 Merge branch 'misc-tmp' into develop 2014-09-03 20:01:17 -07:00
Sam Georges 0acd45e4ca Styling and API improvements to code editor 2014-08-30 15:03:35 +10:00
alekseybobkov fdd83b53c9 Updates in the back-end UX 2014-08-28 19:03:47 +11:00
Sam Georges 3c8f3cdb3f Ctrl/Cmd+S should work inside Redactor 2014-08-22 21:47:22 +10:00
Sam Georges 799273414f Update redactor to latest 2014-08-22 20:15:12 +10:00