Commit Graph

1099 Commits

Author SHA1 Message Date
alekseybobkov 57777c0aad Ace editor updated to the latest version. Implemented the back-end controls utility class. Some back-end UI classes are updated and displsable now. Editor tabs on the CMS page now properly free memory and DOM elements when they're closed. 2015-04-25 22:48:49 -07:00
alekseybobkov a4ab611228 Merge branch 'develop' of github.com:octobercms/october into develop 2015-04-25 14:33:47 -07:00
alekseybobkov e3a4dd64c5 Fixed the Richeditor's UI blocks toolbar. 2015-04-25 14:32:32 -07:00
alekseybobkov 0e4db692af Refactored october.hotkey.js, codeeditor.js, richeditor.js. Minor fix in the rich editor styling. 2015-04-25 14:07:22 -07:00
alekseybobkov 87b34295eb Refactored hotkey plugin for the better memory handling. Added dispose-control event support. 2015-04-24 21:08:07 -07:00
Samuel Georges 87644166ad Adds internal download link for protected files 2015-04-25 12:53:54 +10:00
alekseybobkov fa48fbd8f0 Merge branch 'develop' into refactoring-profiling 2015-04-23 19:02:30 -07:00
alekseybobkov 594a849171 Fixes https://github.com/rainlab/pages-plugin/issues/38 2015-04-23 17:59:37 -07:00
Samuel Georges 7ad12350c6 Merge pull request #1074 from gpasztor87/master
Minor style fixes
2015-04-24 09:26:59 +10:00
Samuel Georges 9173e3bb9a Merge branch 'develop' into media-manager 2015-04-23 18:09:18 +10:00
alekseybobkov 6458149cd5 Disposing the code editor 2015-04-22 21:33:07 -07:00
alekseybobkov 35f742c8f5 Further CMS page JS normalization, minor fix in Inspector. 2015-04-21 22:20:55 -07:00
alekseybobkov 5928aded9f CMS page JS code is tested and fixed after refactoring. 2015-04-21 21:30:02 -07:00
alekseybobkov 43784bf5b9 Merge branch 'media-manager' into refactoring-profiling 2015-04-21 20:52:46 -07:00
Samuel Georges 1a037bad04 Add the ability to include middleware in CMS / Backend controllers
Add init.php script to plugins
Fixes https://github.com/octobercms/library/issues/106
2015-04-21 20:07:34 +10:00
Pásztor Gábor dd0c82544a Fixes in richeditor: z-index 2015-04-18 22:22:26 +02:00
Pásztor Gábor 997a032849 Minor style fixes 2015-04-18 22:12:56 +02:00
alekseybobkov 7fb36588cc Implemented keyboard navigation. Minor fix in the scrollpad class. 2015-04-15 21:48:16 -07:00
alekseybobkov 87a2ea1350 Implemented Insert Video and Insert Audio features 2015-04-14 22:44:45 -07:00
alekseybobkov d8fd1c6d3e Refactored and unified the support of UI blocks in the Rich editor 2015-04-13 22:10:58 -07:00
Samuel Georges cf1988eeca Fixes #1068 2015-04-13 21:51:22 +10:00
Samuel Georges 0a26827abd Refs #1064 - Throw a nicer error here 2015-04-12 19:58:28 +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 c96cef702c Merge pull request #1065 from SaifurRahmanMohsin/patch-1
Missing comma
2015-04-12 08:38:42 +10:00
Saifur Rahman Mohsin ad307e77be Missing comma
Login error due to a missing comma in array
2015-04-12 01:05:15 +05:30
Samuel Georges 2afe43e0fd getAvatarThumb should takes options for thumb compilation 2015-04-11 22:55:10 +10:00
Samuel Georges 8859723f35 Fixes #1062 - Subsequent popups are passed _relation* fields
Note in future: The bindToPopups() function could/should be made recursive
2015-04-11 12:23:49 +10:00
Samuel Georges bdd4b21748 Fixes #1028 - Update Redactor to 10.0.9 2015-04-11 11:27:33 +10:00
Samuel Georges a273fb2acf Merge pull request #1057 from plexnum/develop
fix related model update when deferred binding
2015-04-11 11:04:06 +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 4ce2191113 Typo 2015-04-11 10:42:27 +10:00
Samuel Georges 914ce695be Fixes #1056 - account menu width is too short for multilingual 2015-04-11 10:38:15 +10:00
Samuel Georges ffd4b5a68a Extract checkboxlist all/none JS to october.form.js 2015-04-11 10:35:04 +10:00
Samuel Georges a9b9b916ca Merge pull request #1036 from scottbedard/patch-2
Fixes issue #1035
2015-04-11 10:17:30 +10:00
Samuel Georges 8b9db3440a Merge pull request #1054 from meteormatt/develop
Update Chinese (China) language
2015-04-10 22:34:15 +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
plexnum a20712b73c fix related model update when deferred binding 2015-04-09 07:28:01 +03:00
Liu Xing fde5a16da1 Merge pull request #4 from octobercms/develop
上游合并
2015-04-08 18:48:53 +08:00
刘星 d03f8fa65f update zh-cn setting 2015-04-08 18:33:55 +08:00
Samuel Georges 0f630c80d9 Improve framework code to support $(this) in data attributes 2015-04-08 07:44:26 +10:00
Samuel Georges 13b14729fd Don't allow a record to be clicked if there is no form to display 2015-04-06 16:57:53 +10:00
Samuel Georges 93dd61efc7 Move the search term constraint under the same query group
Refs https://github.com/octobercms/october/pull/775
2015-04-06 16:25:43 +10: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 9e9aa97101 Minor clean up, tabs can now define a url (data-tab-url) set using replaceState 2015-04-04 17:26:47 +11:00
Samuel Georges 37dea95caa Adds a new body class 'breadcrumb-flush'
^ that directs the breadcrumb to sit flush to the element below
2015-04-04 14:54:18 +11:00
Samuel Georges 67ba31b946 Use shorter index names
Fixes https://github.com/octobercms/install/issues/64
2015-04-03 07:41:53 +11:00
Dave Shoreman d18a0a6453 Add missing ApplicationException dependency
The relation backend formwidget throws an `ApplicationException` when a relation isn't defined, but the exception is missing its `use` statement. This PR adds it in. See error below:

![Screenshot showing error thrown](http://i.imgur.com/4Ka6fL2.png)
2015-04-01 19:13:42 +01:00