1099 Commits

Author SHA1 Message Date
Samuel Georges
2a7dbdd74a Merge branch 'stable' into ui
Conflicts:
	modules/cms/classes/CmsObject.php
	modules/cms/widgets/MediaManager.php
2016-03-25 18:42:13 +11:00
Samuel Georges
4ddc8055c6 Merge branch 'develop' into stable 2016-03-25 18:39:16 +11:00
Samuel Georges
e19ae42e45 (Rollback) Keep instances to themselves 2016-03-25 14:17:13 +11:00
Samuel Georges
4fe6cc6509 Adds a clearInternalCache method to SettingsModels
Fixes #1815
2016-03-25 12:44:42 +11:00
Samuel Georges
0950959904 Do not show disabled plugins in the update list
Fixes #1716
2016-03-25 12:37:15 +11:00
Samuel Georges
010cd403f5 Detail column now supports lengthy updates
Fixes #1816
2016-03-25 10:59:17 +11:00
Samuel Georges
2a3a63857c text/javascript is obsolete. Fixes #1847 2016-03-21 19:13:01 +11:00
Samuel Georges
fad028bc40 Add local cmsObject.fillViewBagArray event
Tidy up some inline docs
2016-03-19 13:22:08 +11:00
Samuel Georges
3db2809fc4 Register Halcyon Service Provider 2016-03-07 18:46:45 +11:00
Scott Bedard
fcfcb96d0d Add ctrl+click support for rowlinks
Ctrl+click is supported pretty well in the backend, this adds it to rowlinks as well.
2016-03-06 02:29:57 -07:00
alekseybobkov
aaff88b8c2 Reduced base border radius 2016-03-02 21:40:33 -08:00
Samuel Georges
27d32d35ea Allow vertical scroll to act as horizontal
Not everyone has a trackpad and can scroll horizontally, so vertical scroll can substitute here
2016-03-02 18:06:46 +11:00
kaserv
51d1f1a684 issue #1819 2016-03-01 10:20:20 +04:00
Samuel Georges
9c59dd58d3 Trial tooltip nav, recompile assets 2016-03-01 08:59:20 +11:00
Samuel Georges
1241f584d0 Merge remote-tracking branch 'remotes/origin/stable' into ui 2016-03-01 07:02:07 +11:00
Samuel Georges
3a483c4129 Rollback "fix" color button close in modal
Not enough information on why this is needed, it causes component close icon to appear black
2016-02-29 18:12:27 +11:00
alekseybobkov
00ced6c79f UI update 2016-02-28 19:52:21 -08:00
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
c736643202 Tweak the dash loader @alekseybobkov
The leaf is too hard to customize (white label considerations)
Use a white container with subtle fade after loading
Introduce rspin (reverse spin) animation, not used, but may come in handy
2016-02-25 18:57:13 +11:00
Samuel Georges
f6d76fade6 Moved dashboard css from storm to backend
Dashboard is a specific part of the backend and storm should stand alone from this
2016-02-25 18:07:25 +11:00
alekseybobkov
a892fff938 UI updates 2016-02-24 21:24:31 -08: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
alekseybobkov
b1770626d7 UI updates 2016-02-23 21:44:05 -08:00
Denis Malinochkin
d801bafed5 Update Russian localization to the current build number 2016-02-23 17:43:05 +03:00
alekseybobkov
1deeddeedb Minor update in the UI 2016-02-22 21:55:36 -08:00
alekseybobkov
6ed4bd5ef6 Updates in the UI 2016-02-22 21:52:23 -08:00
Samuel Georges
ff52ad6595 Remove Illuminate references 2016-02-23 13:46:57 +11:00
alekseybobkov
839eb02136 Merge branch 'stable' into ui 2016-02-19 22:13:25 -08:00
alekseybobkov
a943708b99 UI updates 2016-02-19 22:12:41 -08: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
68aa59dae7 Updated main menu styles 2016-02-15 20:27:01 -08: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