perploug
|
33b3032b30
|
Merge pull request #269 from hartvig/7.0.1
Fixes links in help
|
2013-12-14 03:02:28 -08:00 |
|
Niels Hartvig
|
31e5ed7b1b
|
Fixes links in help
|
2013-12-14 11:48:08 +01:00 |
|
Stephan
|
98c8d637f4
|
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
src/Umbraco.Core/DatabaseContext.cs
src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/install/utills/LegacyClasses.cs
|
2013-12-13 13:05:10 +01:00 |
|
Stephan
|
8a3eae9ea6
|
Merge remote-tracking branch 'origin/7.0.1' into 7.0.2
|
2013-12-13 12:55:46 +01:00 |
|
Stephan
|
5aec753859
|
U4-3710, -3732 - Fix default ShortStringHelper
|
2013-12-13 12:20:57 +01:00 |
|
Shannon
|
51da5343ea
|
Fixes installation issue with rebuilding media cache
Conflicts:
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Web.UI/config/trees.config
src/Umbraco.Web/Umbraco.Web.csproj
|
2013-12-13 17:07:29 +11:00 |
|
Shannon
|
34df5009e0
|
Upgraded installer to do a two part install - first install then if an upgrade is required do the upgrade in a second call - this way we can have the progress bar update since the media xml installer can take some time.
|
2013-12-13 16:58:21 +11:00 |
|
Shannon
|
6a5a320a22
|
doh, didn't mean to commit this config change
|
2013-12-13 16:54:16 +11:00 |
|
Shannon
|
62cf1cd87d
|
Fixes: U4-3844 U7 - System.OutOfMemoryException: Out of memory - uploading 11Mb image
|
2013-12-13 16:50:11 +11:00 |
|
Shannon
|
ebf22d155e
|
Updated the migration to just remove the data it needs instead of rebuilding as that would take a very long time for some installs.
|
2013-12-13 12:53:02 +11:00 |
|
Shannon
|
01644e8f6c
|
Upgraded installer to do a two part install - first install then if an upgrade is required do the upgrade in a second call - this way we can have the progress bar update since the media xml installer can take some time.
|
2013-12-13 12:34:57 +11:00 |
|
Shannon
|
f2be1669bf
|
Fixes installation issue with rebuilding media cache
|
2013-12-13 12:02:32 +11:00 |
|
perploug
|
24911bffe2
|
adds version number to help dialog
|
2013-12-12 12:28:43 +01:00 |
|
perploug
|
d343340f56
|
Adds missing language keys
|
2013-12-12 12:28:25 +01:00 |
|
perploug
|
0c82f78c43
|
Upgrades tinymce lib to support IE11
|
2013-12-12 12:27:49 +01:00 |
|
perploug
|
5cf3a619f7
|
Fixes: U4-3841 sorting picked media items with the multiple media picker clears the selection
|
2013-12-12 09:16:02 +01:00 |
|
Shannon
|
49550b410a
|
Ensures Integer and Email validators are added on startup as manifest validators.
|
2013-12-12 18:28:45 +11:00 |
|
Shannon
|
b9df55ef98
|
fixing more tests
|
2013-12-12 18:09:48 +11:00 |
|
Shannon
|
e456c44b46
|
Fixing some unit tests
|
2013-12-12 17:57:50 +11:00 |
|
Shannon
|
61315a8d83
|
Merge remote-tracking branch 'origin/6.2.0' into 7.0.1
Conflicts:
src/Umbraco.Tests/ObjectExtensionsTests.cs
|
2013-12-12 17:53:27 +11:00 |
|
Shannon
|
a1c65f0518
|
Gets that naggy unit test passing
|
2013-12-12 17:52:03 +11:00 |
|
Shannon
|
49c8313c9e
|
Fixes: U4-3638 - U7 - Preview mode seems permanent and shows incorrect content on front of website, when using same browser as admin login
|
2013-12-12 17:30:27 +11:00 |
|
Shannon
|
141f9b6ea1
|
ensures the cssclass is set for selecting media items (oops, had removed that before)
|
2013-12-12 16:23:33 +11:00 |
|
Shannon
|
d223ee97cd
|
Fixes: U4-3840 MediaPicker doesn't show images when there are also folders inside of the folder being viewed
and moves some of the util classes into their own files, adjusted media picker's icon sizes too to make it more readable.
|
2013-12-12 16:16:59 +11:00 |
|
Shannon
|
a098e49840
|
Fixes: U4-3835 U7(nightly214) - Umbraco.Field not working
|
2013-12-12 14:41:01 +11:00 |
|
Shannon
|
8785239964
|
Finalizes the implementation of getting the menu items rendering for child of listview items for both content and media.
|
2013-12-12 14:10:03 +11:00 |
|
Shannon
|
74a691ac3a
|
Removes all the console.log calls
|
2013-12-12 14:09:03 +11:00 |
|
Shannon
|
38c1669e57
|
Gets content items that are children of listviews to query for their affiliated tree-node and display the action menu.
|
2013-12-12 13:27:33 +11:00 |
|
Shannon
|
58f0d1a464
|
fixes null check on HttpQueryStringFilterAttribute and adds ability to specify parameters in the GetUmbracoApiService urlhelper extensions.
|
2013-12-12 13:26:53 +11:00 |
|
Shannon
|
f30740bd49
|
grid is working nicely now with a couple tests
|
2013-12-12 11:38:34 +11:00 |
|
perploug
|
3de3ccad00
|
Fixes related links word-breaking
|
2013-12-11 13:32:17 +01:00 |
|
perploug
|
75502ca18c
|
Compact form less adjustments
|
2013-12-11 13:09:45 +01:00 |
|
perploug
|
c531c36cab
|
adds target to RTE link picker
|
2013-12-11 13:09:25 +01:00 |
|
perploug
|
387e64acac
|
Fixes wrong app_plugin dialog path
Changes /app_plugin/folder/umbraco to /app_plugins/folder/backoffice
which the way we documented it
|
2013-12-11 09:47:56 +01:00 |
|
perploug
|
91a5d55183
|
Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1
|
2013-12-11 09:44:37 +01:00 |
|
Shannon
|
9819318060
|
Fixes up the auth http post
|
2013-12-11 18:53:00 +11:00 |
|
Shannon
|
2e990a7869
|
All working now, Fixes: U4-3722 Images in Media folder are huge
|
2013-12-11 18:05:04 +11:00 |
|
Shannon
|
ed7175192b
|
images that are smaller than the min display size will now just be centered in the square and are no longer scaled up.
|
2013-12-11 17:53:19 +11:00 |
|
Shannon
|
4e63bb38f3
|
margins are now working nicely.
|
2013-12-11 16:44:20 +11:00 |
|
Shannon
|
d61b9bfdd7
|
Awesome progress on the photo folder changes to have correctly calculated images sizes - now just need to get margins going and centering of images that are smaller than the min.
|
2013-12-11 14:34:04 +11:00 |
|
Shannon
|
0de53308f5
|
Fixes some issues with app startup/authentication and when events fire
|
2013-12-11 12:01:22 +11:00 |
|
Shannon
|
85bf47df82
|
Fixes FileUploadPropertyEditor and IFileSystem usage
|
2013-12-11 09:05:38 +11:00 |
|
Shannon
|
791c3f5208
|
added missing view file
|
2013-12-11 08:51:07 +11:00 |
|
perploug
|
bc7876681b
|
docs: dialogservice
|
2013-12-10 15:31:08 +01:00 |
|
perploug
|
68aa3f7b1b
|
broke touch detection, reverting
|
2013-12-10 12:15:40 +01:00 |
|
perploug
|
976531fe7e
|
Removes missing file from web.ui.csproj
|
2013-12-10 12:08:13 +01:00 |
|
perploug
|
ded7350d74
|
Docs: util.service.js
|
2013-12-10 11:23:54 +01:00 |
|
perploug
|
e3594bf6fc
|
Fixes: U4-3723 Only possible to link to content (not media) in Richtext editor
Adds file link button to link dialog, that proxies through the standard
media dialog
|
2013-12-10 11:20:00 +01:00 |
|
Shannon
|
6a6d9ec7b0
|
Updates the image helper and imagescontroller to never scale images larger than what they are.
|
2013-12-10 18:24:20 +11:00 |
|
Shannon
|
200a400fc5
|
put the row style on to the photo folder, without it the image widths are not calculated correctly and span over a row (depending on your current screen size). Since the currently implementation isn't really responsive anyways this at least makes it look better. We can later detect size changes and re-calc how they should be laid out. Updates the JS code to be more readable by humans.
|
2013-12-10 18:23:45 +11:00 |
|