Commit Graph

2941 Commits

Author SHA1 Message Date
Samuel Georges fd16f38b11 Implement file definitions (extensions + ignore files)
Block "unsafe" extensions from being uploaded to the Media manager
Fixes #1801
2016-02-29 18:12:26 +11:00
Samuel Georges 136ec18084 This allows AJAX to function on maintenance and 404 pages 2016-02-27 22:39:26 +11:00
Samuel Georges 74ec5517d8 Missing comma , 2016-02-27 15:03:25 +11:00
Samuel Georges d76863a3ec Merge branch 'develop' into stable
Conflicts:
	composer.json
2016-02-27 14:55:52 +11:00
Samuel Georges 8e9ae8e53e Clean up from #1631
- Files in the media library can now contain two dots
- Retina Images Support
2016-02-27 14:49:38 +11:00
Samuel Georges 423360b2d2 Merge pull request #1631 from JoelESvensson/develop
Files in the media library can now contain two dots
2016-02-27 14:36:38 +11:00
Samuel Georges b88e78ffb4 Minor 2016-02-27 14:22:56 +11:00
brenodouglas 54ecc0c91a Add in install self-update for composer
Add composer self-update in before scripts
Refs #1788
2016-02-27 14:20:28 +11:00
brenodouglas 2caf2d6f84 Modify in less file icon close 2016-02-27 14:20:00 +11:00
brenodouglas 74953e3499 Install packages of plugins in composer.json using composer-merge-plugin
Refs #1788
2016-02-27 14:19:58 +11:00
Breno Douglas Araujo Souza ec03b7b2f8 Access paramater in onStart method in the partial
Variables passed in parameter partils not accessed in onStart method in the partial.

With merged vars before render partial, stays like this::

```php
function onStart() {
   $this['param'];
}
```
2016-02-27 14:18:22 +11:00
breno cc45c499ed fix color button close in modal 2016-02-27 14:18:21 +11:00
sNuuFix a724a3aeb2 Fixed framework extra stylesheets for validator.w3.org HTML5 validation. 2016-02-27 14:13:20 +11:00
Samuel Georges fbed1dd2ed Merge pull request #1799 from mcustiel/feature-component-autowiring
Added the ability to inject dependencies into components
2016-02-27 14:09:14 +11:00
Samuel Georges d58a8478f6 FTFY Refs #1796
The event should come after the logic as per the developer guidelines. If the event comes before the logic, it should be called beforeLogin. In this case, beforeLogin doesn't make sense, so just move the event after the parent::afterLogin call.
2016-02-27 14:07:21 +11:00
Samuel Georges 48148cfcd0 Merge pull request #1796 from filipac/patch-1
Add a new event on login - backend.user.login
2016-02-27 14:06:18 +11:00
Samuel Georges b9a4808c28 Merge pull request #1800 from mrmlnc/develop
Update Russian localization to the current build number
2016-02-27 14:01:29 +11:00
Samuel Georges 2fc0db5732 Merge pull request #1804 from haegemon/develop
fix output of function isDisabled in accordance to phpdoc and function naming
2016-02-27 14:01:10 +11:00
Samuel Georges fa61ef2df9 Fortify index_onDelete a little more
Refs #1805
2016-02-27 13:58:59 +11:00
Samuel Georges 65eac15b00 Merge pull request #1805 from gpasztor87/develop
Add index_onDelete method to ListController behavior.
2016-02-27 13:16:44 +11:00
Samuel Georges 98eb4f8239 Add support for "relation" with Tree models
- This makes the list slightly more efficient for small collections, less efficient for larger collections. If this becomes a problem in future we may need to look at a solution that grabs all the root nodes to start, then lazy loads any expanded nodes as secondary AJAX requests.
- Write tests for the Tree trait improvements
Fixes #1647
2016-02-27 11:29:07 +11:00
Samuel Georges 21f3ac93c1 Add support for HTML comments
Fixes #1808
2016-02-27 09:46:00 +11:00
Pásztor Gábor 984674d987 Missing return 2016-02-25 07:44:02 +01:00
Pásztor Gábor c17e9b0e33 Add index_onDelete method to ListController behavior. 2016-02-25 07:42:07 +01:00
Samuel Georges 40e458d0b0 Colon is a valid character, doesn't mess up themes with underscores
Eg: SLIDERWEB.SLIDERWEB_0002_hydrogen-theme -> SLIDERWEB.SLIDERWEB.0002.hydrogen-theme

Reference: https://www.w3.org/TR/html401/types.html#type-name
ID and NAME tokens must begin with a letter ([A-Za-z]) and may be followed by any number of letters, digits ([0-9]), hyphens ("-"), underscores ("_"), colons (":"), and periods (".").
2016-02-25 15:01:12 +11:00
Samuel Georges 77367c4cd9 Adds windows support to october:util git pull 2016-02-25 14:38:07 +11:00
Samuel Georges 79dfb37fe3 Adds october:util git pull command 2016-02-25 14:28:50 +11:00
pawel c38b841eb8 fix function output in accordance to phpdoc and function naming 2016-02-25 01:11:29 +03:00
Samuel Georges 9dc1b4d836 * Build 317 2016-02-24 13:29:02 +11:00
Samuel Georges 83fbddf5ee URI should end with the extension
This prevents access to files such as script.jpg.php, while such a file is not possible to upload today, we can never be too sure.
2016-02-24 10:49:34 +11:00
Denis Malinochkin d801bafed5 Update Russian localization to the current build number 2016-02-23 17:43:05 +03:00
Samuel Georges ce202c7951 create_onSave() forgot to extend model 2016-02-23 14:36:00 +11:00
Samuel Georges ff52ad6595 Remove Illuminate references 2016-02-23 13:46:57 +11:00
Mariano Custiel c94706ed05 Added the ability to create instances of components from factories to allow injection of dependencies in components
Fixed descriptions

Added missing new lines at the end of fixture components

Fixed problem with include path

Fixed code as suggested. Now everything is solved through app::make

Removed tests that are not needed anymore since last changes
2016-02-22 09:44:14 +01:00
Samuel Georges 4d113dd041 Write collision tests for sluggable
Refs #1793
Test concatenated slugs while we're here
2016-02-20 17:15:58 +11:00
Samuel Georges 202e542985 Oddly, JS may pass false as a string (@todo) 2016-02-20 17:15:21 +11:00
Samuel Georges da71a21172 Add oc.tableUpdateData event and readOnly to string processor
Minor tidy
2016-02-20 15:38:29 +11:00
Samuel Georges 18194fa0f9 Complete Table server data source
Recompile assets
2016-02-20 12:45:36 +11:00
Samuel Georges c7530eece9 Merge pull request #1781 from sajjad-ser/master
Fix Some Typo
2016-02-20 10:17:01 +11:00
Samuel Georges 9b06549a13 Merge pull request #1783 from iBourgeois/master
Update AssetList.php
2016-02-20 10:15:13 +11:00
Samuel Georges 95f4be8b68 Include user id in cache key
Fixes #1740
2016-02-20 09:39:18 +11:00
Samuel Georges 87fc6f154d Include .htaccess in mirror
Fixes #1750
2016-02-20 09:16:48 +11:00
Samuel Georges 25f931d8f8 We use Selenium 1 for testing atm
Fixes #1751
2016-02-20 09:11:13 +11:00
Samuel Georges 2e819f0142 Remove deprecated method 2016-02-20 08:19:14 +11:00
Samuel Georges 49d56480b8 Merge pull request #1786 from jfoliveira/feature/pt_br_translations
Update pt-br translations
2016-02-20 07:42:32 +11:00
Samuel Georges 54d749f034 Like setProperty(), this should not return a value 2016-02-17 17:49:52 +11:00
alekseybobkov af3c67a270 Merge branch 'develop' of github.com:octobercms/october into develop 2016-02-15 17:23:29 -08:00
alekseybobkov d58b6d4d51 Fixed loading permissions from plugin.yaml 2016-02-15 17:23:10 -08:00
Jeferson Oliveira 68689fbc90 Fix preposition. 2016-02-15 23:03:50 -02:00
Jeferson Oliveira f0271638c9 Update pt-br translations. 2016-02-15 22:22:00 -02:00