Commit Graph

160 Commits

Author SHA1 Message Date
Sam Georges 1c6d48ffa8 Fixes a strange issue where a <button> inside a nested <form> will trigger the event twice (1 for button, 1 for form) 2014-10-27 17:59:53 +11:00
Sam Georges 32adc79924 Revert to FA-only icons 2014-10-22 14:22:41 +11:00
Sam Georges 578f1c0945 Update icons 2014-10-22 14:15:21 +11:00
Sam Georges 677030c5fa Update Font Autumn icon pack 2014-10-21 20:21:39 +11:00
Sam Georges a9eecfecd5 Remove blueimp uploader, replaced with dropzone.js 2014-10-20 18:55:31 +11:00
Sam Georges ed552f1591 Minor code clean 2014-10-18 15:52:44 +11:00
Sam Georges d74a15b297 Update font autumn to latest 2014-10-17 17:33:59 +11: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
Sam Georges b55cfa0aff Use contain 2014-10-15 20:03:12 +11: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 82192c3e55 Add light/dark variations of primary/secondary colors 2014-10-15 08:10:38 +11:00
Sam Georges d194f34cf8 Merge branch 'develop' into customize-backend 2014-10-13 18:35:39 +11:00
alekseybobkov 0b8af1f505 Merge branch 'develop' into static-pages-support 2014-10-10 22:27:01 -07:00
Sam Georges 4504d5bf4c Improve translation handling 2014-10-11 10:37:48 +11:00
alekseybobkov 26e8d5bda5 Minor updates in the back-end UI 2014-10-05 22:21:03 -07:00
Sam Georges 79fd2e2afe Adds colorpicker form widget, add initial form for customizing backend 2014-10-03 18:01:37 +10:00
Sam Georges f89f3416d4 Adds nested option used for isolating containers 2014-09-29 17:13:05 +10:00
Sam Georges 4d54160e16 Update fork ref 2014-09-29 16:26:21 +10:00
Sam Georges 88d67a7100 Fixes #359 - Sorting should work for hybrid touch/mouse devices now 2014-09-29 16:21:56 +10:00
Sam Georges b37ba3ccfd Fixes flaw in JS, custom dropdowns now focus when invalid 2014-09-29 14:15:49 +10:00
Sam Georges 6363205f34 Fixes validation on Tabs and Cms pages 2014-09-29 14:04:05 +10:00
Sam Georges 27708f7fa8 Fixes #633 - Return to previous keymap 2014-09-29 09:56:49 +10: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 a4379e89b1 Add empty type to triggerapi 2014-09-25 18:51:40 +10:00
Sam Georges 6cc36d39f2 Refs #623 - Add persian map to inputpreset 2014-09-20 10:15:01 +10:00
alekseybobkov a9e2e2d80f Improvements in the CMS objects and back-end UI. 2014-09-18 20:34:24 -07:00
alekseybobkov 4fc461ade7 Changes in the popover styling 2014-09-18 20:34:24 -07:00
alekseybobkov a77b290a8e Improvements in the back-end widgets 2014-09-18 20:34:24 -07:00
alekseybobkov e383f0bd01 Fixes in the Redactor styling 2014-09-18 20:03:59 -07:00
Sam Georges bb78bb5fb3 Make the BG 1 point darker, so it is actually visible on Win PC 2014-09-18 19:16:10 +10:00
Sam Georges 277a2daf7b Improvements to rich editor 2014-09-13 14:09:48 +10:00
alekseybobkov 8c08b9ccbb Minor fix 2014-09-07 12:59:08 -07:00
Sam Georges 14c8bc9a49 Update blueimp software to latest 2014-09-06 15:11:55 +10:00
Sam Georges 4a3fd88637 Add sweet transition animations on keywords 2014-09-06 10:40:32 +10:00
Sam Georges 2f4a432afc Update select2 to latest, add basic styles for multi mode 2014-09-05 18:11:25 +10:00
alekseybobkov 904b855778 Fix for the checkbox field in the Inspector 2014-09-04 19:03:33 -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
alekseybobkov 012d5a4d1c Merge branch 'develop' of github.com:octobercms/october into develop 2014-08-29 14:16:33 +11:00
alekseybobkov fdd83b53c9 Updates in the back-end UX 2014-08-28 19:03:47 +11:00
Sam Georges 4db38b1650 Improve october.hotkey.js 2014-08-22 21:02:32 +10:00
alekseybobkov e7767176ce Updated the treeview control, updated Redactor scripts, the CMS Content is now a compound object 2014-08-22 18:45:05 +11:00
Samuel Georges e73f82bffe Merge pull request #570 from Flynsarmy/popupErrors
Refs #568 - Inherit the parent framework error function
2014-08-21 08:12:43 +10:00
flynsarmy 80b10bd45b Refs #568 - Inherit the parent framework error function 2014-08-20 15:37:10 +10:00
Sam Georges 5df02a3eb9 Refs #568 - Inherit the parent framework success function 2014-08-20 10:12:44 +10:00
alekseybobkov 176f41f0f1 Merge branch 'develop' of github.com:octobercms/october into develop 2014-08-14 16:51:49 +11:00
alekseybobkov 4f55def792 Implementing the treeview element 2014-08-14 16:51:31 +11:00
Sam Georges 3b41b3e81f Finish up basic Filter implementation 2014-08-13 21:23:19 +10:00