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

11065 Commits

Author SHA1 Message Date
Claus
c37a6bb928 Merge pull request #870 from JJCLane/UKFest-U4-6094 
Adds a check to include users in the send to translation list that ha…
 2015-11-17 13:48:01 +01:00
Claus
0fecad9867 Merge pull request #906 from umbraco/temp-U4-6515 
Fixes: U4-6515 Media picker does not set $dirty
 2015-11-17 11:51:58 +01:00
Claus
3045068d68 Fixes: U4-6515 Media picker does not set $dirty 
Included fix for member picker.
 2015-11-17 10:59:21 +01:00
Claus
37a6668313 Merge branch 'U4-6515' of git://github.com/deepak4u/Umbraco-CMS into deepak4u-U4-6515 2015-11-17 10:50:07 +01:00
Sebastiaan Janssen
36814d746f Merge pull request #905 from GertyEngrie/dev-v7 
U4-7297 - fixes <hr/>-button in tinymce
 2015-11-17 10:34:37 +01:00
Claus
a72f6edb6b Merge pull request #846 from OptimisticCoder/UKFest-U4-6732 
U4-6732 - Added message on back office, when JS is disabled.
 2015-11-17 10:23:06 +01:00
Claus
012ed6cf16 Merge pull request #862 from dampee/u4-7314 
U4-7314 Change name of "Textbox Multiple" to "TextArea"
 2015-11-17 08:57:49 +01:00
Gerty Engrie
eb3ff12916 U4-7297 - fixes <hr/>-button 2015-11-17 00:35:10 +01:00
Claus
5435c44ea9 Using a lower z-index to fix the issue at hand. 2015-11-16 16:00:43 +01:00
Claus
76fa477c35 Merge branch 'U4-7393' of git://github.com/Acentrage/Umbraco-CMS into Acentrage-U4-7393 2015-11-16 15:55:04 +01:00
Claus
1f6f36d8c8 Updated unit test after adding in TaskTypeMapper. 2015-11-16 15:53:58 +01:00
Claus Jensen
c46ac11125 Merge pull request #849 from mzajkowski/UKFest-U4-6282 
U4-6282  Add note to Register Partial Macro
 2015-11-16 15:37:47 +01:00
Claus
73d5a3f993 Merge branch 'opelpanfan-UKFest-U4-6511' into dev-v7 2015-11-16 15:31:29 +01:00
Claus Jensen
5a99a6903d Merge pull request #888 from umbraco/temp-U4-7353 
Fixes: U4-7353 OAuth providers for the back office require more flexi…
 2015-11-13 14:47:11 +01:00
Shannon Deminick
775639da41 Merge pull request #848 from Khinrot/UKFest-U4-5560 
Fixing "U4-5560 White space issue in content tree"
 2015-11-13 14:06:40 +01:00
Shannon Deminick
2375ede161 Merge pull request #867 from jbreuer/U4-4028 
U4-4028 Don't load the full images, but server side resized.
 2015-11-13 13:41:53 +01:00
Shannon Deminick
fcd00599da Merge pull request #858 from tompipe/U4-1959 
Fixes U4-1959
 2015-11-13 13:40:26 +01:00
Shannon
d3f5090150 Fixes up a couple of missing path updates and incorrect icon resolution and fixed another issue with webservice path reference 2015-11-13 13:38:30 +01:00
Shannon
6a7faf457b Merge branch 'dev-uk-U4-1117' of https://github.com/JeffreyPerplex/Umbraco-CMS into JeffreyPerplex-dev-uk-U4-1117 2015-11-13 11:35:29 +01:00
Shannon
ec247d2b27 ensures the migration table's seed is higher than 1 (have put it to 100). 2015-11-13 11:31:59 +01:00
Shannon
f32479bb10 bumps version 2015-11-13 11:26:31 +01:00
Shannon Deminick
371269436f Merge pull request #891 from umbraco/temp-U4-7128 
Fixes: U4-7128 Send to Translation gives YSOD
 2015-11-13 10:23:41 +01:00
Claus
ef13e4112f Merge branch 'UKFest-U4-6511' of git://github.com/opelpanfan/Umbraco-CMS into opelpanfan-UKFest-U4-6511 2015-11-12 16:40:01 +01:00
Claus Jensen
ce5b6861bb Merge pull request #855 from ryanmcdonough/UKFest-U4-5617 
UKFest-U4-5617 RTE now respects CSS Directory AppSetting.
 2015-11-12 16:35:27 +01:00
Acentrage
6bf1ecdb11 Fixes U4-7393 
Safe to use both for mobile and desktop.
 2015-11-12 15:17:27 +01:00
Claus Jensen
fdd0ff2c23 Merge pull request #897 from umbraco/temp-U4-7070 
Fixes: U4-7070 UX - Mediapicker autofocus when creating a folder
 2015-11-12 15:14:19 +01:00
Claus
bade8e42ba Fixes to media picker when creating new folders. 
Changed to ngShow to ensure input field hides when blur event is hit.
Clearing and switching visibility of input field on successful submit.
Fixed up focus directive to use $timeout. The focus event can trigger before the element is rendered by angular so its safer to have a timeout ensure it is done at the end of the digest cycle - using $timeout instead of setTimeout ensures it is handled by angular at the right time.
 2015-11-12 15:12:59 +01:00
Claus
cfdf2768e6 Merge branch 'UKFest-U4-7070' of git://github.com/JJCLane/Umbraco-CMS into JJCLane-UKFest-U4-7070 2015-11-12 14:05:10 +01:00
Claus Jensen
c3ca006f14 Merge pull request #896 from umbraco/temp-U4-3774 
Fixes: U4-3774 Change password UX
 2015-11-12 13:36:36 +01:00
Claus
6c47c8f792 Added danish translation. 2015-11-12 13:36:13 +01:00
Claus
63160e2e2d Removing the Change Password tab from Content section. 2015-11-12 13:31:03 +01:00
Claus
edc58fe8a5 Merge branch 'dev-uk-U4-3774' of git://github.com/JeffreyPerplex/Umbraco-CMS into JeffreyPerplex-dev-uk-U4-3774 2015-11-12 11:23:36 +01:00
Claus Jensen
23632dc0c3 Merge pull request #856 from tompipe/U7-6928 
Fixes U4-6928 - Persist Creator ID of member
 2015-11-12 11:07:57 +01:00
Claus Jensen
d739b9fb31 Merge pull request #894 from umbraco/temp-U4-6167 
Fixes: U4-6167 MNTP: show path of selected node
 2015-11-12 10:58:24 +01:00
Claus
2ae4ede258 Showing path when hovering nodes should be configurable on the content picker. 2015-11-12 10:55:00 +01:00
Claus
4eddfb4cf5 Merge branch 'U4-6167' of git://github.com/tompipe/Umbraco-CMS into tompipe-U4-6167 2015-11-11 17:13:40 +01:00
Claus
f2b3d7c041 Removed commented out line. 2015-11-11 12:07:45 +01:00
Claus
5d97a94dcb Fixed to use alias instead of hardcoded id. 
Added mapper for TaskType.
 2015-11-11 12:02:12 +01:00
Claus
de6e7dd28d Merge branch 'U4-7128' of git://github.com/tompipe/Umbraco-CMS into tompipe-U4-7128 2015-11-11 11:14:38 +01:00
Claus Jensen
420c029bf7 Merge pull request #859 from Khinrot/UKFest-U4-6426 
Fixing "U4-6426 CTRL click should open in a new window"
 2015-11-11 11:12:22 +01:00
Claus
61441dd436 Fixes: U4-7370 Upgrading from 7.3.1 to 7.4 fails 
cherrypicked from 7.4.0 branch.
Added migration for 7.3.2, ensuring the identity on the table is correct. It failed due to rows initially being inserted with identity disabled and therefore the seed of the table was zero even when the table had data.
 2015-11-10 12:15:44 +01:00
Shannon
bbbea99ced removes redundant null check. 2015-11-09 10:56:07 +01:00
Shannon
3d213342bf Fixes: U4-7353 OAuth providers for the back office require more flexibility with Challenge Results 2015-11-09 10:42:15 +01:00
Stephan
30f0c96052 Fix AsyncLock finalizer throwing exceptions 2015-10-31 12:47:04 +01:00
Stephan
cfab30a1ef Fix thread CultureInfo issue breaking PetaPoco 2015-10-31 12:47:03 +01:00
Stephan
1dd0086eb5 Revert "strange/crazy peta poco fix for cultures" 
This reverts commit 0d29e1438c.
 2015-10-31 12:47:02 +01:00
Jordan Lane
5d9a935621 Adds a check to include users in the send to translation list that have the translate permission for current page 
http://issues.umbraco.org/issue/U4-6094#
 2015-10-29 16:50:00 +00:00
Tom Pipe
1ff4fe26dd Fixes YSOD after send to translation 2015-10-29 16:43:54 +00:00
Jeroen Breuer
3c9953979a U4-4028 Don't load the full images, but server side resized. 2015-10-29 17:00:23 +01:00
deepak4u
5ff329778d fix for issue u4-6515 2015-10-29 15:53:11 +00:00