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
857c7c715a
Adds experimental october:mirror command
2015-04-11 23:03:15 +10:00
f0c7b66576
Adds minor safeguard to #1044
...
^- For objects that can be cast as strings and do not interface Symfony's Response
2015-04-11 11:19:53 +10:00
ebcf57e8e3
Merge remote-tracking branch 'remotes/matiss/patch-1' into develop
2015-04-11 11:08:44 +10:00
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
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
f143c0e2ce
Merge pull request #1051 from scottbedard/patch-4
...
Adds input type to data-track-input
2015-04-10 22:34:35 +10:00
8b9db3440a
Merge pull request #1054 from meteormatt/develop
...
Update Chinese (China) language
2015-04-10 22:34:15 +10:00
0b6587f771
Fixes #1019 - prevents lock out of full screen mode
...
Reorder system setting items
2015-04-09 20:20:08 +10:00
fde5a16da1
Merge pull request #4 from octobercms/develop
...
上游合并
2015-04-08 18:48:53 +08:00
0f630c80d9
Improve framework code to support $(this) in data attributes
2015-04-08 07:44:26 +10:00
51c868e693
Adds input types to data-track-input options
...
I need this input type, and it would be handy if I could use it with data-track-input. I promise this will be the last time I ask you to touch your priceless faberge egg ;)
2015-04-07 09:37:02 -04:00
7546174b35
Adds "request-complete" to the data-attributes api
...
... I hope.
2015-04-06 19:14:17 -04:00
3361789b2f
Update validation.php
...
Changed some translations to be more organic for brazillian portuguese
2015-04-06 13:08:23 -03:00
ace4175fdd
CSS -> LESS
2015-04-06 18:05:56 +10:00
bc64201f02
Fixes bug not displaying recommended plugins
2015-04-06 18:01:03 +10:00
b806bd0720
Fixes installed theme count
2015-04-06 15:31:33 +10:00
790b464679
Merge branch 'develop' into media-manager
2015-04-04 19:01:08 -07:00
a921201d6d
Fixes broken search
2015-04-04 17:31:39 +11:00
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
9e9aa97101
Minor clean up, tabs can now define a url (data-tab-url) set using replaceState
2015-04-04 17:26:47 +11:00
26d92d282f
Fixed custom error pages outputting headers
...
If we don't have this method called, then the controller returns an object. From then on, [Symfony converts this object in to a string](https://github.com/symfony/HttpFoundation/blob/master/Response.php#L406 ). This string is **not just the content of the view**, but the headers as well.
After attaching this method, `handleCustomError()` returns a string and everything works as expected.
2015-04-02 09:59:07 +03:00
31f598237a
Merge pull request #1039 from freestream/swedish-lang-improvements
...
Improved and added missing Swedish translation
2015-04-01 19:04:40 +11:00
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
ed107a6541
Added swedish language for module 'system'
2015-03-29 15:30:23 +00:00
926dd277b7
Translate -> Module -> System
2015-03-29 13:12:38 +03:00
46f3a36383
Confirm clearing > deleting
2015-03-28 11:36:41 +11:00
5731ad0db7
Merge branch 'develop' into media-manager
2015-03-26 18:37:24 -07:00
5d79be79eb
Added Norwegian language support
2015-03-26 23:16:29 +01:00
5503705576
Define more backend permissions
...
Addresses some of the concerns raised in #218 (fixes #218 )
2015-03-26 21:56:04 +11:00
897d291b78
Improve and update Brazilian files
2015-03-25 17:03:57 -03:00
5baac47519
修改翻译
2015-03-25 14:30:05 +08:00
4044911057
Update Chinese language
2015-03-24 12:42:35 +08:00
03c46012dc
Merge branch 'develop' into media-manager
2015-03-17 19:30:57 -07:00
66f0c683a8
Merge pull request #1004 from gergo85/patch-1
...
Updated Hungarian language
2015-03-16 21:10:01 +11:00
502e2abed2
Updated Hungarian language
2015-03-16 08:51:15 +01:00
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
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
d5c93e12e9
Don't try to log 404s without a DB
2015-03-14 15:07:57 +11:00
c9a18af508
Trim project id and plugin codes
2015-03-14 11:31:49 +11:00
61022d3961
Merge branch 'master' of github.com:octobercms/october
2015-03-14 11:22:16 +11:00
68819ef476
Merge pull request #1000 from masnug/lang-id
...
Bahasa Indonesia
2015-03-14 11:19:00 +11:00
203e4edc0b
Minor touch ups
2015-03-13 22:15:43 +11:00
a8389fb1aa
Tooltip now auto initializes
...
initForm can now pass context
Various improvements and bug fixes
2015-03-12 20:50:16 +11:00
fb180a748c
Add Bahasa Indonesia (OC *222)
2015-03-12 13:37:12 +07:00
0433720a11
* Build 222
2015-03-11 19:18:40 +11:00
02db7cd00a
Minor tweak to #980
2015-03-07 13:22:48 +11:00
fa627ff996
Merge pull request #980 from gergo85/master
...
Update translation
2015-03-07 13:21:29 +11:00
40f08ad3db
Merge pull request #975 from gergo85/master
...
Updated Hungarian language
2015-03-07 13:20:51 +11:00
a0f071e5a7
Remove 'mysettings' items from the main settings menu
2015-03-06 20:50:10 +11:00
alekseybobkov
Samuel Georges
Liu Xing
Scott Bedard
drFabio
Matīss Jānis Āboltiņš
Anton Samuelsson
Denis Malinochkin
krisawzm
Amanda Tresbach
Szabó Gergő
Wuri Nugrahadi