Commit Graph

14629 Commits

Author SHA1 Message Date
Simon Busborg
31147fa8d1 missing comma 2015-12-15 10:26:22 +01:00
Simon Busborg
d75f8bf1bd added wrapper to directive 2015-12-15 10:24:38 +01:00
Simon Busborg
ecb6c8e52c Fix for U4-7373 Error notifications shown are hidden underneath the dialogs
http://issues.umbraco.org/issue/U4-7373
2015-12-15 10:08:19 +01:00
Claus
3cdd650b66 Merge pull request #940 from umbraco/temp-U4-7445
Temp u4 7445
2015-12-14 11:31:02 +01:00
Simon Busborg
8bd3b25a66 Fix for: http://issues.umbraco.org/issue/U4-7518
New list view (umb-table) misses published/unpublished state
2015-12-11 14:26:17 +01:00
Rune Strand
10b828379b Element hinzufügen! 2015-12-09 09:31:38 +01:00
Rune Strand
7431ed4db1 Better wording 2015-12-08 13:42:05 +01:00
Rune Strand
cb07ec3157 Add dialog localization and new keys to all lang 2015-12-07 18:07:08 +01:00
Sebastiaan Janssen
7a4b7c25dd Can't use higher versions of angular-dynamic-locale
See: https://github.com/lgalfaso/angular-dynamic-locale/issues/82
2015-12-07 13:00:57 +01:00
Sebastiaan Janssen
a162974bf9 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into 7.4.0 2015-12-07 11:51:34 +01:00
Sebastiaan Janssen
a7377d0686 Merge pull request #939 from hartvig/dev-v7
Fixing a little typo as reported by Chris Houston
2015-12-07 11:49:28 +01:00
hartvig
68a4749917 Fixing a little typo 2015-12-07 11:11:02 +01:00
Sebastiaan Janssen
ff61112c18 Updates installer background 2015-12-07 10:32:24 +01:00
Sebastiaan Janssen
a427ca6d4e Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into 7.4.0 2015-12-07 10:26:26 +01:00
Sebastiaan Janssen
81763bf4d8 Merge pull request #938 from hartvig/dev-v7
Adding number of countries to the installer faq
2015-12-07 10:25:09 +01:00
hartvig
0e0bc9fbef Adding number of countries to the installer faq 2015-12-07 10:11:35 +01:00
Claus
964d9a9328 Closing break tag. 2015-12-06 17:55:20 +01:00
Rune Hem Strand
93f199b5e3 Add localization to Grid (en) 2015-12-04 13:23:24 +01:00
Sebastiaan Janssen
453efc02a5 Removes old obsoleted ping.aspx 2015-12-04 11:10:12 +01:00
Mads Rasmussen
58a68bba97 Fixes: U4-7387 bug preventing drag and drop upload in media library card layout 2015-12-03 13:24:09 +01:00
Stephan
22eea2b7db Fix tests 2015-12-03 12:56:59 +01:00
Sebastiaan Janssen
fe88e4df5f Merge branch 'temp-U4-6659' into 7.4.0 2015-12-03 12:18:58 +01:00
Sebastiaan Janssen
34156ae7bb Merge branch '7.4.0' into temp-U4-6659 2015-12-03 12:18:46 +01:00
Sebastiaan Janssen
f2d5cff66a Merge branch 'konami-easteregg' into 7.4.0 2015-12-03 12:15:43 +01:00
Sebastiaan Janssen
0fc41d0552 Merge branch '7.4.0' into konami-easteregg 2015-12-03 12:15:23 +01:00
Sebastiaan Janssen
b09aaee52d Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2015-12-03 11:49:23 +01:00
Mads Rasmussen
62e4bebab6 Fixes: U4-4051 Bug when querying for root node with the remembered node id 2015-12-03 11:45:59 +01:00
Sebastiaan Janssen
36ef7a6505 Merge branch 'temp-U4-7366' into 7.4.0 2015-12-03 10:43:56 +01:00
Sebastiaan Janssen
e293051498 Merge branch '7.4.0' into temp-U4-7366 2015-12-03 10:43:10 +01:00
Sebastiaan Janssen
34a95353c2 Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2015-12-03 10:31:37 +01:00
Mads Rasmussen
dbc519a9cf Fixes: U4-7478 Set cookie to remember last chosen list view layout 2015-12-03 10:14:51 +01:00
Mads Rasmussen
6729f39b4e Fixes: U4-7474 rename member tree path + set header name not to be locked 2015-12-03 09:44:52 +01:00
Sebastiaan Janssen
a3dd51ba98 Remove dead code 2015-12-03 09:44:29 +01:00
Sebastiaan Janssen
109aff737b Fixes spelling error 2015-12-03 09:43:50 +01:00
Sebastiaan Janssen
cd369bf078 Move some repeated GUIDs to a constants class 2015-12-03 09:43:33 +01:00
Sebastiaan Janssen
c7aa3d63fb Merge branch 'temp-U4-7372' into 7.4.0
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixZeroOne/UpdatePropertyTypesAndGroups.cs
2015-12-03 09:22:19 +01:00
Rune Strand
a6b1239138 Merge branch 'temp-U4-7366' of https://github.com/umbraco/Umbraco-CMS into temp-U4-7366 2015-12-02 21:24:23 +01:00
Rune Strand
e4365af312 Fixes full width drop overlays 2015-12-02 21:24:08 +01:00
Mads Rasmussen
ab884b00bf make entire cell placeholder clickable 2015-12-02 21:21:54 +01:00
Rune Strand
41bf7fc53d Add drop overlay for empty cells 2015-12-02 17:23:59 +01:00
Rune Strand
914343e00c Add check if drop area is actually a valid cell 2015-12-02 15:43:47 +01:00
Rune Strand
b5d12aca5e Sort into empty cells 2015-12-02 15:19:09 +01:00
Sebastiaan Janssen
d863ff364e U4-7321 Update Doc type edit link on content item for 7.4 since it will be different
#U4-7321 Fixed
2015-12-02 14:41:37 +01:00
Mads Rasmussen
b3988e81f5 Merge pull request #930 from umbraco/temp-U4-6924
Fixes: U4-6924 Ensure drag/drop media uploads show notifications - since the way this works has been overhauled in 7.4
2015-12-02 13:46:08 +01:00
Sebastiaan Janssen
4d4a7b5078 U4-7343 Change the order of trees under Settings: Make "Document Type" the first item in the settings section
#U4-7343 Fixed
2015-12-02 13:33:40 +01:00
Mads Rasmussen
160fc5effd Merge pull request #929 from umbraco/temp-U4-7387
Fixes: U4-7387 It's not possible to select folders in listview in media section
2015-12-02 13:29:46 +01:00
Claus
e4a0dc5d55 Fixed indentation. 2015-12-02 09:52:35 +01:00
Mads Rasmussen
e242474496 fix media picker merge mistake 2015-12-01 19:40:05 +01:00
Rune Strand
879ea73195 Updates jQuery UI to vLatest #woohoo 2015-12-01 15:51:15 +01:00
Sebastiaan Janssen
e1c1a99131 Fix merge mistake 2015-12-01 15:21:52 +01:00