Commit Graph

148 Commits

Author SHA1 Message Date
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
Samuel Georges 85b97c5419 Refs #850 - Minor code clean 2015-01-03 15:48:07 +11:00
Samuel Georges 735ede7d47 Merge pull request #850 from scottbedard/patch-2
Valid strtotime() format when time is left empty
2015-01-03 15:45:01 +11:00
Samuel Georges ae8289735c Rem unneeded file 2015-01-03 15:15:52 +11:00
Samuel Georges be702900d7 Rem debug code 2015-01-03 13:20:40 +11:00
Samuel Georges 7dd147a62a Create initial DataTable form widget 2015-01-03 11:57:50 +11:00
Scott Bedard 8286880148 Valid strtotime() format when time is left empty
Date-type laravel validation ("date", "before", and "after") may not be used with datetime widgets containing empty time fields because they are not in a valid strtotime() format (example: 2014-12-27 :00).

This extra check ensures a valid strtotime() format by only adding the ":00" seconds value when a time value is present.
2014-12-27 17:33:27 -05:00
Adam 04e02727ce Type in oc-icon-paperclip class
Fixed type in oc-icon-paperclip class (from paper-clip to paperclip) which meant that the attachment link wasn't showing in backed.
2014-12-15 11:49:30 +00:00
Chris Harvey 78fb9fb110 Correcting class name for missing relation exception 2014-12-10 11:34:05 +00:00
Samuel Georges ab24c547a2 Move NO_SAVE_DATA to FormField 2014-12-05 16:46:04 +11:00
Samuel Georges 3dbe487698 Various fixes to datepicker and form widget 2014-11-27 19:02:23 +11:00
Samuel Georges e6d82bec69 Clean up code from #797, remove conflicts in CSS 2014-11-27 09:44:34 +11:00
webmaxx 7973037d5f Fixes display values for datetime 2014-11-26 13:57:25 +03:00
Samuel Georges 6a8146fa19 Refs #795 - Fixes set values for datetime 2014-11-26 19:02:06 +11:00
Samuel Georges 81a02cea96 Refs #795: Combine TimePicker and DatePicker 2014-11-26 17:57:59 +11:00
webmaxx faf867f745 Added form widget "TimePicker" to Backend. 2014-11-25 13:33:33 +04:00
Sam Georges c32ba4cbad Minor code clean 2014-11-04 17:41:48 +11:00
Sam Georges d2547d1891 Proposed fix for hasOne not working in Relation field type 2014-11-04 12:34:45 +11:00
Sam Georges f99f776e44 Update ACE to source mode 2014-11-02 13:06:43 +11:00
Sam Georges 2fbc277ece Fixes #680 - Update and minify ACE editor, removed modes we dont need (#725) 2014-11-01 17:16:43 +11:00
Sam Georges 212d28d66b Refs #725 - Remove ace modes we don't use 2014-11-01 17:11:15 +11: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 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