Robert
|
026e46cec0
|
Merge pull request #2166 from umbraco/lars-erik-U4-7580-rename-containers
Make U4-7580 (DocTypes/MediaTypes folder re-nameable feature) work with Deploy
|
2017-09-11 11:19:30 +02:00 |
|
Shannon
|
7e794dd021
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-11 19:14:01 +10:00 |
|
Shannon
|
0b14f255d2
|
syncs more translation bits
|
2017-09-11 19:00:11 +10:00 |
|
Mads Rasmussen
|
c4ab25f1ac
|
fixing first round of unit tests
|
2017-09-11 10:50:54 +02:00 |
|
Shannon
|
e6edaf1c3a
|
Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7
|
2017-09-11 18:44:17 +10:00 |
|
Shannon
|
c4810ba45a
|
fixes quirk with change password directive and new members - fixes merge issue where the controller for the directive was cleared
|
2017-09-11 18:44:02 +10:00 |
|
Mads Rasmussen
|
b669741adb
|
fixes missing language keys in invite user
|
2017-09-11 10:26:44 +02:00 |
|
Shannon
|
c232fa2add
|
fixes tree header localization for the default (US) language, was missing partial views
|
2017-09-11 16:34:29 +10:00 |
|
Mads Rasmussen
|
29f3acc23e
|
Merge pull request #2163 from umbraco/temp-U4-10275
U4-10275 Render 'site' nodes for the content/media trees for users with non root access
|
2017-09-10 18:04:59 +02:00 |
|
Sebastiaan Janssen
|
e6bf4e6c69
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-09 00:02:36 +02:00 |
|
Sebastiaan Janssen
|
37c4fc5f74
|
Don't try to remove directories that don't exist
|
2017-09-09 00:02:08 +02:00 |
|
Sebastiaan Janssen
|
ac8a0ddc58
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-08 23:52:23 +02:00 |
|
Sebastiaan Janssen
|
406a206b03
|
Apparently we still have a node_modules folder, but no more xslt folder though!
|
2017-09-08 23:50:15 +02:00 |
|
Sebastiaan Janssen
|
e7fc252f4c
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-08 23:29:58 +02:00 |
|
Sebastiaan Janssen
|
55e0af118a
|
Weirdly this errored out on 7.7 with a "Task 'cli' is not in your gulpfile" error..
not sure why this exact same file works in this branch
|
2017-09-08 23:29:16 +02:00 |
|
Sebastiaan Janssen
|
c66a763406
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-08 18:58:48 +02:00 |
|
Sebastiaan Janssen
|
718ed19fb9
|
Forgot to remove this.. Seb is getting tired!
|
2017-09-08 15:05:15 +02:00 |
|
Sebastiaan Janssen
|
32999b7e19
|
Correction, we don't need this file after all :-)
|
2017-09-08 14:58:50 +02:00 |
|
Sebastiaan Janssen
|
ce63251206
|
Adds missing file to gulp build
|
2017-09-08 14:53:33 +02:00 |
|
Sebastiaan Janssen
|
7b641f4771
|
Adds missing files for the build server
|
2017-09-08 14:45:00 +02:00 |
|
Sebastiaan Janssen
|
708d060c3b
|
Fix up BuildBelle.bat
|
2017-09-08 14:12:54 +02:00 |
|
Sebastiaan Janssen
|
e254dddbd4
|
Copy the js and lib files from the correct directories
|
2017-09-08 14:12:54 +02:00 |
|
Sebastiaan Janssen
|
87c2c5455c
|
We don't have node_modules in this directory any more
|
2017-09-08 14:12:54 +02:00 |
|
Sebastiaan Janssen
|
8544aa685b
|
VS loves managing whitespace.. go ahead then
|
2017-09-08 14:12:53 +02:00 |
|
Sebastiaan Janssen
|
09c23e93c2
|
Looks for the build output app.js to determine if we need to call BuildBelle.bat
|
2017-09-08 14:12:53 +02:00 |
|
Sebastiaan Janssen
|
9946d36d00
|
Ignore npm-debug.log
|
2017-09-08 14:12:53 +02:00 |
|
Sebastiaan Janssen
|
7012633fdd
|
Install gulp before gulp-cli
|
2017-09-08 14:12:53 +02:00 |
|
Claus
|
6e348a3a1a
|
Merge branch 'HarveyWilliams-patch-4' into dev-v7
|
2017-09-08 13:59:35 +02:00 |
|
Claus
|
733c920867
|
using string.replace instead of regex.
adding unit test.
|
2017-09-08 13:57:28 +02:00 |
|
Mads Rasmussen
|
35fc997d9f
|
fix stylesheets for canvas designer/preview
|
2017-09-08 13:13:26 +02:00 |
|
Claus
|
921e8a2529
|
Merge pull request #2180 from umbraco/temp-U4-10392
U4-10392 Culture and hostnames with special characters can register a…
|
2017-09-08 11:27:25 +02:00 |
|
Claus
|
22bd6cd989
|
U4-10392 Culture and hostnames with special characters can register as collisions
|
2017-09-08 11:25:41 +02:00 |
|
Shannon
|
5398d24f58
|
disables deleting translator group
|
2017-09-08 16:07:58 +10:00 |
|
Shannon
|
d06c92d249
|
fixes send to translate to lookup the translate group by the correct alias
|
2017-09-08 16:00:04 +10:00 |
|
Shannon
|
719d520a82
|
null check for change password
|
2017-09-08 15:59:35 +10:00 |
|
Shannon
|
75ace2b162
|
Fixes deleting a template - uses the correct way to delete stuff with angular and not relying on legacy code
|
2017-09-08 15:45:10 +10:00 |
|
Shannon
|
7ae95e31a1
|
Ensures the root node is not shown in the copy/media dialogs for content/media when start ndoes are assigned, fixes entity searching since there was js errors (maybe from a bad merge)
|
2017-09-08 15:16:13 +10:00 |
|
Shannon
|
81ba2069af
|
fixed media start node mapping for user
|
2017-09-08 15:11:39 +10:00 |
|
Shannon
|
858c21c79f
|
Ensures Content header node isn't shown in copy/move dialogs when the user has a start node set that is not the root
|
2017-09-08 14:28:18 +10:00 |
|
Shannon
|
504f32f25b
|
Merge branch 'dev-v7.7' into temp-U4-10275
|
2017-09-08 13:53:02 +10:00 |
|
Shannon
|
38c961209e
|
Ensure the user's administratively reset password doesn't get re-shown in the UI - that was based on an actual password reset
|
2017-09-08 13:48:32 +10:00 |
|
Shannon
|
c39e1175fd
|
Fixes up some more password changing quirks
|
2017-09-08 13:43:38 +10:00 |
|
Shannon
|
1d5348763d
|
Fixes up invite message, fixes reset password quirk, ensures password values are cleared after changing password, ensures that the confirm password value is not posted to the server
|
2017-09-08 13:15:03 +10:00 |
|
Shannon
|
3c6ab8d34f
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-08 12:49:36 +10:00 |
|
Shannon
|
0713f12ba6
|
makes new classes internal
|
2017-09-08 12:02:20 +10:00 |
|
Shannon
|
8981fd23a8
|
makes new classes internal
|
2017-09-08 11:41:49 +10:00 |
|
Shannon
|
ab3407a1aa
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
# src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
# src/Umbraco.Web/Umbraco.Web.csproj
|
2017-09-08 11:31:04 +10:00 |
|
Sebastiaan Janssen
|
dad4eafebd
|
Enable RDP to figure out gulp build problem
|
2017-09-07 22:25:45 +02:00 |
|
Mads Rasmussen
|
96c9ecbdd7
|
fix calc functions
|
2017-09-07 21:39:41 +02:00 |
|
Sebastiaan Janssen
|
e7e04de22e
|
Merge pull request #2179 from umbraco/temp-dperfs
deploy-383 - dperfs
|
2017-09-07 20:46:31 +02:00 |
|