Commit Graph

308 Commits

Author SHA1 Message Date
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 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
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 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 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
Amanda Tresbach 897d291b78 Improve and update Brazilian files 2015-03-25 17:03:57 -03: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 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
alekseybobkov 4e1217e2de Implemented item sorting. Minor fix in the drop-down list styling. 2015-03-16 21:49:39 -07:00
Samuel Georges 851d421092 Update various language references 2015-03-16 19:33:58 +11: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 68819ef476 Merge pull request #1000 from masnug/lang-id
Bahasa Indonesia
2015-03-14 11:19:00 +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 40f08ad3db Merge pull request #975 from gergo85/master
Updated Hungarian language
2015-03-07 13:20:51 +11:00
Kuba f3f21fdf83 Polish translation fixes 2015-03-06 23:07:52 +01: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
alekseybobkov 1c273f28ba Implementing the MediaLibrary class, in progress 2015-02-24 22:02:03 -08:00
Samuel Georges 393c900342 Refs #900 - Add polish language 2015-01-31 14:26:45 +11: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
jtherczeg 831ff79c47 Corrections and updates for Build 182 2015-01-21 18:32:23 +01:00
jtherczeg a629c46c69 Updates for Build 178
Hungarian language files updated for Build 178
2015-01-16 15:00:40 +01: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 8f8ac2dd02 Merge pull request #860 from gergo85/master
Improve multilanguage support and cleanup
2015-01-03 15:56:09 +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
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
Denis Malinochkin ee5bc8407c Clean key & Update Ru lang 2014-12-08 03:51:39 +03: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
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
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
jtherczeg bb25a1a82c Hungarian language files for modules committed 2014-11-03 09:41:09 +01:00
alvaro.canepa d9c06c9ed5 Spanish language support 2014-10-24 23:02:38 -02: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 57ec5c7261 Moved asset combiner to the system module 2014-10-15 08:09:46 +11: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
Sam Georges 062ce2f50a Closes #673 - Add Argentine Spanish (es-AR) locale 2014-10-11 16:32:51 +11:00
Stefan Talen e114f29582 Updating modules/cms/lang 2014-10-11 01:32:11 +02:00
sajjad-ser 1cf70bf032 Add Persian Translate 2014-10-07 17:37:37 +03:30
Anderson Carlos Woss 32ad8cc09e Add full translation for pt-br 2014-08-30 22:38:32 -03:00
Samuel Georges fb56fbfabd Merge pull request #573 from mrmlnc/develop
ru_lang (138)
2014-08-22 08:07:10 +10:00
Samuel Georges 111589dec6 Merge pull request #577 from stefantalen/dutch-translations
Updated dutch language files
2014-08-22 08:06:48 +10:00
Stefan Talen 5455c6c1af Updating dutch language files 2014-08-21 23:07:50 +02:00
Sam Georges 20e279bf4c Page URLs now support dots (.)
Add hook for cms.page.init
2014-08-21 19:47:29 +10:00
Denis Malinochkin 9a798cf46a ru_lang (138) 2014-08-20 17:10:22 +04:00
adi 03d9f81b47 Added Romanian translation files in modules/*/lang/ro and modified modules/backend/models/BackendPreferences.php and modules/system/lang/en/lang.php in order for the language to appear in the admin section 2014-08-16 15:00:07 +03:00
Paul Wilde 1d038d3173 More translation strings. 2014-08-12 01:15:38 +01:00
Nicola Marini 5b6e75357b Italian translation
Add the italian translation for the October CMS
2014-08-10 14:17:43 +02:00
Sam Georges 13587f155c Move trans from logic-less array to inside business logic. Convert tabs to spaces. 2014-08-09 12:21:17 +10:00
Paul Wilde 906370c6bd Added translation strings for permission labels, mail template/layout column labels, editor fullscreen, list pagination and list setup modal. 2014-08-09 03:02:15 +01:00
Denis Malinochkin 20bbacdd3f ru_update 2014-08-07 04:14:10 +04:00
Samuel Georges 3859a38c6a Merge pull request #516 from boulox/french-translation
Add french translation
2014-08-05 08:56:10 +10:00
Fabien 5b7161cdd5 Add french translation 2014-08-03 15:20:59 +02:00
Sam Georges 3f31eed160 Add more detailed error for saving cms objects. 2014-08-03 10:52:46 +10:00
Denis Malinochkin ab7e1cfd8a ru_lang 2014-08-02 12:49:01 +04:00
Sam Georges 7cd80f8a59 Throw an error when the active theme is not found 2014-07-23 11:33:19 +10:00
Sam Georges 04888b2b93 Minor 2014-07-19 15:54:09 +10:00
alekseybobkov c324c80969 Added the theme selector 2014-07-19 13:05:50 +11:00
Aveltras de2d47ff5c Created cms french translation file 2014-07-07 21:24:54 +02:00
Sam Georges bc42080e72 Refs #387 2014-07-04 20:08:38 +10:00
alekseybobkov 7056397036 Implemented the hidden page flag. Closes #34. Closes #88. 2014-07-03 17:40:44 +11:00
Sam Georges 91ecb55ca3 Tidy up #314 2014-06-17 19:13:25 +10:00
Louis Matthijssen bbd2915637 Improve the access denied (403) page
This is an improved version of the current access denied (403) page based on the built-in not found (404) page.

Shows a link to the CMS backend if the user is logged in and doesn't have permissions for the backend page it's trying to access, but does have permissions for the CMS backend.

Please note that the following languages are machine translated: ja, pt-br, ru and sv.
2014-06-16 22:58:37 +02:00
Samuel Georges 322833c78b Merge pull request #283 from mrmlnc/master
Russian language and translation keys
2014-06-15 12:05:09 +10:00
eZees f130dac22c Russian language and translation keys 2014-06-12 11:57:27 +04:00
Octo Devel 6095934f81 Updated and revised all pt-br translation lines. 2014-06-11 23:11:31 -03:00
Octo Devel 4e410927ea Added pt-br language 2014-06-09 18:50:35 -03:00
eZees 6e488cc2cb Update Russian language files
Full translation of the language files into Russian.
2014-05-18 04:38:43 +04:00
Hirohisa Kawase 8c26202957 Added Japanese language files for backend/cms/system modules. 2014-05-17 22:16:35 +09:00
Pär Karlsson f80ccf23ab Swedish translations 2014-05-16 15:13:33 +02:00
Sam Georges 12a80cae9c Add new keys to other languages (needs further translation) 2014-05-16 11:29:44 +10:00
Samuel Georges eb3e8df7be Merge pull request #113 from marcus-herrmann/master
Added German language files
2014-05-16 11:14:42 +10:00
Samuel Georges f02b541d2f Merge pull request #111 from erJasp/master
Moved hard-coded text to language file (backend)
2014-05-16 11:06:57 +10:00
Samuel Georges bd7eaf8f12 Merge pull request #96 from pariz/master
Swedish language files for backend, cms and system, as well as one typo if in an english language file
2014-05-16 10:07:06 +10:00
Jasper 8d82727310 Updated CMS language support
Moved hard-coded text in "cms" to the language files (English and
Dutch). And some minor changes.
2014-05-16 01:04:40 +02:00
mhe 80d41c4e4d Add further translation files 2014-05-15 20:25:55 +02:00
Pär Karlsson 2883fa6b6a Fixed typo in english language file 2014-05-15 15:18:07 +02:00
Pär Karlsson f4bf9e192f Added swedish language support 2014-05-15 15:17:41 +02:00
Emir Karşıyakalı c6df6f897b Added Turkish language files 2014-05-15 13:31:17 +03:00
Jasper b4ec8d2297 Added Dutch ("Nederlands") language files 2014-05-15 00:14:30 +02:00
Sam Georges 71a5dd67ab Welcome to the world, October :-) 2014-05-14 23:24:20 +10:00