yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,411 Commits 4 Branches 7 Tags
30da7fb801c8b480db8d558959e45a13b2774582
Commit Graph

1340 Commits

Author SHA1 Message Date
Shannon
30da7fb801 Merge branch '7.1.0-installer' into 7.1.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/resources/entity.mocks.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
	src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js
 2014-03-06 12:28:50 +11:00
Shannon
7086a5153a Fixes js errors with apply since a digest is already in operation. 2014-03-06 12:25:45 +11:00
Shannon
37937e2c8e Fixes the user password validation to ensure it obeys what the membership provider's are configured for. 2014-03-06 12:11:14 +11:00
Shannon
7676099f2e small styling fix on db err msg 2014-03-06 11:14:41 +11:00
perploug
0d1bb355b5 merge 2014-03-05 20:12:45 +01:00
perploug
3276b8a4d8 Latest visual changes to installer + db validator 2014-03-05 20:03:45 +01:00
Shannon
fbd2b3a1e1 Gets the v7 upgrade report working on the new installer. 2014-03-05 18:23:50 +11:00
Shannon
8f7f761bb3 implements the file permissions report correctly and tests it. 2014-03-05 17:44:13 +11:00
Shannon
a40ba2f27e Updates the RequiresExecution logic so we can skip steps based on some user input (i.e. skip the starter kit installation). Fixes the start kit js stuff to update the model correctly and continue. Fixes the error view to restart - it cannot just go back because there might not be a view there. 2014-03-05 14:30:17 +11:00
Shannon
893f86d34c Fixes installer service so that when forward is called and there are no more views to show the installer will automatically start. This will occur in cases where we are customizing the install but we don't want a starter kit installed since the server has detected that one has already been installed. This also prevents some JS errors and will improve the installer in the future if there might be more views. 2014-03-05 12:57:44 +11:00
Shannon
ce068a60d5 Removes default instructions from the installer service, passing in empty instructions is ok now and the server will assign defaults if they are empty. 2014-03-05 12:08:35 +11:00
Shannon
7f7f3202d2 fixes issue with checking starter kit steps, fixes issue with installer service code with the method param name being the same as the variable name and fixes the _find lookups to ensure a value is returned from the iteration. 2014-03-05 11:49:07 +11:00
Shannon
0227b800a0 Gets the installer steps working nicely and returning the next step to execute which now displays the current step details correctly and dequeues steps that are not required after the previous one has executed. 2014-03-05 11:34:42 +11:00
Shannon
8e89aa233c Merge branch '7.1.0-installer' of https://github.com/umbraco/Umbraco-CMS into 7.1.0-installer 
Conflicts:
	src/Umbraco.Web.UI.Client/src/installer/installer.service.js
	src/Umbraco.Web/Install/Controllers/InstallApiController.cs
 2014-03-05 10:34:27 +11:00
Shannon
24ceb5ce2d Updates to include returning the next step in sequence 2014-03-05 10:32:59 +11:00
perploug
923eb300e5 Updates grunt file to run vs file copy 2014-03-04 19:11:27 +01:00
Shannon
0d93db5f1f Fixes the order that descriptions are listed during install 2014-03-04 19:28:57 +11:00
Shannon
d2aecd12eb Updates more installer logic, getting into the nitty gritty details with upgrades, etc... 2014-03-04 19:20:36 +11:00
Shannon
71a9fb4f68 Updated more installer logic 2014-03-04 16:21:45 +11:00
perploug
92f6b5564d Fixes failing js unit tests 2014-03-03 13:21:30 +01:00
perploug
ce65ae8742 Updates to the installer UI 
Adds database and packages step
 2014-03-03 08:57:57 +01:00
perploug
9c4212703b umbraco base url 2014-02-27 10:00:38 +01:00
Sebastiaan Janssen
a20c11d438 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-02-26 22:52:38 +01:00
Sebastiaan Janssen
89b8d056a2 Fixes #U4-4310 Missing Curly Brace in Boolean Property Editor 2014-02-26 22:52:13 +01:00
Jan Skovgaard
70ba0cd592 U4-4295 typo on front of admin 2014-02-26 19:51:56 +01:00
Per Ploug Krogslund
b86ef0d7ac Adds WIP installer files 2014-02-26 15:51:09 +01:00
Per Ploug Krogslund
de97d8849a Fixes broken unit tests 2014-02-26 15:51:09 +01:00
Per Ploug Krogslund
a3576d8564 Moves app controllers into seperate folder 2014-02-26 15:51:08 +01:00
coolmikkel
0a6208f3ef Name of Media items easyer to read 
The contrast between the text color and background was to low. The text
color has to be darker - black would be the right one.
 2014-02-25 22:11:38 +01:00
perploug
81dfd0c6bc #U4-3649 Fixed 2014-02-24 15:35:25 +01:00
Sebastiaan Janssen
218bb28440 #U4-4245 Umbraco version number is really hard to see 
Moved the version to the top when clicking "help", moved the css into main.less and made the text a little bit darker for contrast
 2014-02-24 12:49:07 +01:00
perploug
7c4c44cf7e Enables the breadcrumb nav on media edit 2014-02-24 11:55:54 +01:00
perploug
f3d64bb85d Fixes broken file resolver due to wrong alias 2014-02-24 10:30:35 +01:00
perploug
8261a2b69b Fixes U4-4271 U7.1 Nightly build 16 YSOD when editing doc type 2014-02-24 09:36:10 +01:00
perploug
c3471ffbc3 Cropsizes config and upload compatible 
Refactors imagecropper and fileupload to use the samen metadata setting
extensions
 2014-02-20 12:59:15 +01:00
Shandem
16e16f9578 Merge pull request #299 from kgiszewski/feature-slider-fix 
Fix broken path
 2014-02-19 15:35:30 +11:00
perploug
81305173ca Changes imagecropper to store config in its property data 2014-02-19 00:19:15 +01:00
perploug
6637ceaf41 Add support for looking up 3rd party editor file paths 
Adds a file resolver on the mediaHelper, property editors can then
register a resolver to return file paths from whatever format
 2014-02-19 00:19:13 +01:00
perploug
82d5f7b72b Adjusted assetsService to deal with weird yepnope behaivior 2014-02-19 00:19:12 +01:00
perploug
e69dea26a5 Adds extra null checking when looking up active tree 2014-02-19 00:19:11 +01:00
Kevin Giszewski
85d6f1d54a Fix broken path 2014-02-18 11:07:14 -05:00
perploug
6944f25c9f Fixes Assets.Service callback not firering 2014-02-17 16:17:16 +01:00
perploug
45c7699a33 Footer breadcrumb navigation 2014-02-17 16:17:09 +01:00
perploug
2bd2f12831 ImageCropper Upload enabled 
The cropper can now fully replace the upload datatype
 2014-02-17 16:17:02 +01:00
perploug
fa4e9d0cd1 Merge remote-tracking branch 'origin/7.1.0-ImageCropper-WIP' into 7.1.0 2014-02-11 14:56:41 +01:00
perploug
764644fc5d Merge 2014-02-11 14:55:22 +01:00
perploug
0bf27f4371 Make sure the formcontroller reset dirty state on save 2014-02-11 14:48:06 +01:00
perploug
36a8599e62 Adds cache bursting to production mode 
Package installer bumps CDF version, we make sure to purge the angular
cache
initial js loader gets a cache burst as well
 2014-02-10 13:02:16 +01:00
perploug
2850c3c3de Improved caching in debug mode by adding global yepnope filter 2014-02-07 15:45:52 +01:00
perploug
cec8001c38 Fixes issue with MediaHelper and complex property values 2014-02-07 09:16:05 +01:00