yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,659 Commits 4 Branches 7 Tags
d04efbf5a4b7b51cb11cdba0239a8ee3b6aed453
Commit Graph

13986 Commits

Author SHA1 Message Date
Stephan
d04efbf5a4 Retarget migrations after merge 2016-07-18 10:54:27 +02:00
Stephan
2594fa423f Cleanup after merge 2016-07-18 10:50:41 +02:00
Stephan
a66cf484e8 Fix more tests after merge 2016-07-18 10:37:37 +02:00
Stephan
554b943931 Fix tests after merge 2016-07-08 19:20:57 +02:00
Stephan
be056869f0 Fix build after merge 2016-07-08 18:31:37 +02:00
Stephan
3c7245f9ba Merge origin/dev-v7 into dev-v8 2016-07-08 16:32:06 +02:00
Stephan
f8b315dad0 Build - fix warnings 2016-07-08 14:17:49 +02:00
Sebastiaan Janssen
5ebcdce557 Merge pull request #1374 from umbraco/temp-u4-8682 
U4-8682 - manage cache in tests
 2016-07-07 17:54:39 +02:00
Sebastiaan Janssen
f2d50866d9 Merge pull request #1370 from umbraco/temp-u4-8361 
u4-8361 From ids to guids
 2016-07-07 17:52:41 +02:00
Stephan
6f6c7ede0a U4-8361 - fixing migrations 2016-07-07 16:56:52 +02:00
Sebastiaan Janssen
85c7b102b9 Revert C#6 notation 2016-07-07 16:22:55 +02:00
Sebastiaan Janssen
05cb2050e7 Revert C#6 notation 2016-07-07 16:17:01 +02:00
Warren Buckley
a494ea8dc8 Merge pull request #1350 from umbraco/temp-U4-8640 
U4-8640 Deleting a content type with children only emits a deleted ev…
 2016-07-07 14:40:56 +01:00
Sebastiaan Janssen
d0e47fe1ff Merge pull request #1339 from dannydrogt/temp-u4-8613 
U4-8613 Link to DocType from "Properties" tab is not localized
 2016-07-07 15:38:00 +02:00
Sebastiaan Janssen
7c485dcd50 Forgot password email sent as raw text, but contains html 
#U4-8703 Fixed
 2016-07-07 15:24:53 +02:00
Warren Buckley
a319aa9503 Merge pull request #1365 from umbraco/temp-packaging 
U4-8670 Ensure the create package system in the back office allows for specifying correct metadata
 2016-07-07 13:08:19 +01:00
Warren Buckley
e02fbd0bbe Merge pull request #1355 from umbraco/temp-U4-8561 
Properly URL Encodes stylesheet properties
 2016-07-07 10:47:48 +01:00
Stephan
560c0fbb33 U4-8361 - fixing and perfs 2016-07-06 21:53:08 +02:00
Stephan
c5a346d70f Merge branch 'dev-v7' into temp-u4-8361 2016-07-06 20:00:17 +02:00
Stephan
c1f6708b21 Fix 2016-07-06 18:08:19 +02:00
Stephan
4531bf6c30 U4-8682 - manage cache in tests 2016-07-06 18:01:59 +02:00
Sebastiaan Janssen
c7967dc4f2 Merge pull request #1363 from umbraco/temp-U4-8472 
U4-8472 Add web.config file to media folder path to prevent all execu…
 2016-07-06 16:49:00 +02:00
Warren Buckley
b3259e5d3c Merge pull request #1371 from umbraco/temp-u4-8675 
u4-8675
 2016-07-06 11:42:16 +01:00
Sebastiaan Janssen
620800b448 Merge branch 'dev-v7' into temp-U4-8561 2016-07-06 12:32:06 +02:00
Sebastiaan Janssen
f057eca45a Scratch that.. the Alias is actually the Name. Consistency FTW! 2016-07-06 11:14:59 +02:00
Sebastiaan Janssen
b395d1a049 Alias is already running through ToSafeAlias, doesn't need UrlEncoding 2016-07-06 11:04:27 +02:00
Sebastiaan Janssen
46cd7cae38 Make sure to encode/decode the property name everywhere 2016-07-06 11:02:51 +02:00
Sebastiaan Janssen
b2e9fb1534 Need to UrlDecode the parts[1] part so that we can find and properly delete properties with ampersands 2016-07-06 11:00:34 +02:00
Shannon
1f041f17c1 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-07-06 09:38:00 +02:00
Shannon
ee27264a72 Ensures all instances of SqlCeEngine are in a using claus so native objects are disposed properly 2016-07-06 09:37:52 +02:00
Stephan
1f40043740 Hopefull fixing tests 2016-07-05 15:11:10 +02:00
Stephan
ac44079044 Merge branch 'dev-v7' into temp-U4-8627 2016-07-05 11:45:42 +02:00
Stephan
f799938989 Revert "Merge branch 'U4-8588' ..." 
This reverts commit 1bfb32dcdc.
 2016-07-05 11:44:41 +02:00
Stephan
cec456d672 U4-8675 - minor fixes 2016-07-05 11:31:53 +02:00
Stephan
b9e886c0bc Merge branch 'U4-8675' of https://github.com/benjaminketron/Umbraco-CMS into temp-u4-8675 2016-07-05 10:30:53 +02:00
Stephan
3d2a0b4a29 U4-8361 - from ids to guids 2016-07-04 18:22:06 +02:00
Stephan
6897ee1d14 U4-8469 - bugfix content cache 2016-07-04 18:21:36 +02:00
Shannon
b1b5352e26 updates to latest Markdown version 2016-07-04 14:38:45 +02:00
Søren Kottal
44565226fe U4-7386: Adds summaries to string functions 2016-07-01 22:14:44 +02:00
Shannon
76a962c2e0 published package now includes icon url 2016-06-29 15:44:34 +02:00
Shannon
c05c14988e package saving now working with extra metadata 2016-06-29 15:36:45 +02:00
Shannon
092abfb56d Gets created packages deletion working, gets the min umb version field working on the created packages UI 2016-06-29 15:31:10 +02:00
Shannon
a67020ec31 Ensures that the package Icon is displayed for installed packages. Cleans up lots of try/catch/swallows in the packaging logic, adds better xml error handling (we really need a lot more though), ensures that if any part of the package installation fails, that angular bails and doesn't keep trying to install - same logic for installing forms. 2016-06-28 20:14:12 +02:00
Benjamin Ketron
42ef6d3d76 An attempt to speed up sorting a large set of nodes when a large set of users exist. Our sorts were failing in azure because the user notifications were taking long enough that azure would kill the thread. 2016-06-28 12:03:36 -06:00
Shannon Deminick
7c8f0457f1 Merge pull request #1338 from Jeavon/U4-8612 
Fix for U4-8612 so that Icon shows when installing a local package
 2016-06-28 16:36:31 +02:00
Shannon
1a02841649 U4-8472 Add web.config file to media folder path to prevent all execution based files from being run by IIS 2016-06-28 16:01:23 +02:00
Mads Rasmussen
63b90ad0c9 use umb-progress-bar in package details 2016-06-28 11:27:26 +02:00
Mads Rasmussen
72a319572a add umb-progress-bar component 2016-06-28 11:27:04 +02:00
Claus
4423f965d1 Merge pull request #1359 from umbraco/temp-U4-8592b 
U4-8592 - fix property conversions
 2016-06-28 11:13:22 +02:00
Simon Busborg
3370c57ae6 Merge pull request #1357 from umbraco/temp-U4-8660 
U4-8660 Add avatar angular component
 2016-06-28 10:39:56 +02:00