Commit Graph

923 Commits

Author SHA1 Message Date
Samuel Georges d76863a3ec Merge branch 'develop' into stable
Conflicts:
	composer.json
2016-02-27 14:55:52 +11:00
brenodouglas 2caf2d6f84 Modify in less file icon close 2016-02-27 14:20:00 +11:00
breno cc45c499ed fix color button close in modal 2016-02-27 14:18:21 +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 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
Denis Malinochkin d801bafed5 Update Russian localization to the current build number 2016-02-23 17:43:05 +03:00
Samuel Georges ff52ad6595 Remove Illuminate references 2016-02-23 13:46:57 +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 87fc6f154d Include .htaccess in mirror
Fixes #1750
2016-02-20 09:16:48 +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
saman3230 21574edf01 FIX typo 2016-02-15 17:21:16 +03:30
Samuel Georges 049e5bcfc7 Fix bad var context 2016-02-14 20:10:36 +11:00
Mahmut Namli 6391e9b323 Added new translation strings 2016-02-13 16:44:43 +11:00
Lucas Martín 2fa6b2d7be Update lang.php + client.php 2016-02-13 16:28:48 +11:00
Samuel Georges ea0127afcf Stripe indicator is late to the party
Fixes #1737
The AJAX events may fire before document.ready has executed, leaving $.oc.stripeLoadIndicator as null and throwing an error
2016-02-13 16:04:16 +11:00
Samuel Georges 5e6fc130bb Merge pull request #1732 from sajjad-ser/master
Update persian language
2016-02-13 15:52:39 +11:00
Samuel Georges 668ccf2588 Merge pull request #1722 from tresbach/patch-1
Fix negative count
2016-02-13 15:30:22 +11:00
Samuel Georges 808c8f0ca4 Minor tidy and rollback from #1720 2016-02-13 14:41:17 +11:00
Joshua Wilson 6f3d7a58f2 Phpdoc cleanup for System\Traits
removed in WidgetMaker trait

phpdoc cleanup of backend traits and classes

Minor fix for cases when file is not found
2016-02-13 14:06:50 +11:00
Samuel Georges 17717e94ec Do not send "undefined" data in ajax
Thanx @BOOMER74
2016-02-13 13:33:20 +11:00
Samuel Georges 87f4cfc91f Use a dedicated hostname 2016-02-12 06:12:48 +11:00
Samuel Georges acfb35cbed Merge branch 'develop' into stable 2016-02-10 20:03:51 +11:00
Samuel Georges 03e7c19a5d Fixes issue where twig passed null
Minor update to dropdown docs
2016-02-09 17:58:37 +11:00
alekseybobkov c762ed2836 Merge branch 'builder-ui' into develop 2016-02-07 14:41:45 -08:00
alekseybobkov 1454a4ed6b Fixed a bug in the Inspector string list autocomplete editor where clicking an item in the autocompletion list doesn't select the item. 2016-02-07 14:40:31 -08:00
alekseybobkov f5e47ebc88 Merge branch 'builder-ui' into develop 2016-02-04 18:00:49 -08:00
alekseybobkov bfb0fa1671 Merge branch 'develop' of github.com:octobercms/october into develop 2016-02-04 18:00:42 -08:00
alekseybobkov 241332e14a Minor style updates for the Inspector header area 2016-02-04 18:00:10 -08:00
alekseybobkov 8cb5ec1c0e Fixed several minor bugs in Inspector. 2016-01-29 22:16:33 -08:00
Sajjad d2619b6ba4 Update persian language 2016-01-28 18:00:07 +03:30
alekseybobkov 264090fb3b Added new Inspector editor - String List Autocomplete 2016-01-26 19:53:35 -08:00
Amanda Tresbach adf42896da Fix negative count 2016-01-24 14:23:58 -02:00
alekseybobkov 6aef72bb87 Added "depend" parameter to the Inspector autocomplete editor. Minor fix in the Inspector. 2016-01-23 20:27:57 -08:00
alekseybobkov f6dec96c86 Improved memory management in the table widget client-side scripts. Minor CSS fixes. 2016-01-22 21:43:45 -08:00
Samuel Georges 205d122dce Logic error. Fixes #1692 2016-01-19 21:03:03 +11:00
alekseybobkov 778e73964e Merge branch 'develop' of github.com:octobercms/october into develop 2016-01-17 18:55:12 -08:00
alekseybobkov 5f2e6f3306 Allow word wrap in the Inspector autocomplete editor 2016-01-17 18:55:00 -08:00
Samuel Georges b65a653176 Add ability to null asset broadcasting from AJAX 2016-01-16 17:12:54 +11:00
Samuel Georges d34350a7b1 Merge branch 'develop' into stable 2016-01-16 10:20:21 +11:00
Alwin Drenth 94cbe93e8c Update Dutch language 2016-01-16 10:18:20 +11:00
Samuel Georges c4f5a25193 Merge pull request #1687 from gpasztor87/stable
Remove deprecated code
2016-01-16 09:09:07 +11:00
Samuel Georges ee155bf1f3 Merge pull request #1702 from gpasztor87/patch-2
Cleanup
2016-01-16 09:07:15 +11:00
Pásztor Gábor 40b8af22a9 Remove unneded Password and Gate alias. 2016-01-15 10:14:39 +01:00