Shannon
9acbe09449
fixes the tmh dynamic local version, the bower version the build server runs has an issue!
2015-11-26 12:02:08 +01:00
Shannon
f62581bd38
reverts more of the caps lock
2015-11-26 11:39:49 +01:00
Shannon
9782e3711e
Revert "Update bower.json with ngCapsLock"
...
This reverts commit f0e1460550 .
Conflicts:
src/Umbraco.Web.UI.Client/bower.json
2015-11-26 10:54:43 +01:00
Shannon
fc84821e8b
fixes U4-6340 Partial view macro with parameters not working in RTE - to use a Model to post with the same Action name
2015-11-26 10:32:43 +01:00
Shannon Deminick
0fcf0b505a
Merge pull request #922 from engern/U4-6340
...
Fixes U4-6340 : Partial view macro with parameters not working in RTE and Grid (backend)
2015-11-26 09:54:24 +01:00
Shannon
c8482b9f59
Revert "Merge pull request #875 from Phosworks/U4-7312"
...
This reverts commit 14265fc964 , reversing
changes made to 18c3345e47 .
Conflicts:
src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
src/Umbraco.Web/Editors/ImagesController.cs
2015-11-25 20:27:58 +01:00
Shannon
b7795e19ef
Changes bigthumbnail pr to not cache per second, just minute
2015-11-25 20:21:24 +01:00
Shannon Deminick
14265fc964
Merge pull request #875 from Phosworks/U4-7312
...
Changed web api GetBigThumbnail to image processor
2015-11-25 19:52:14 +01:00
Shannon
068c4a0b16
Fixes PR for U4-7362 Add message to login screen if Caps Lock is on
2015-11-25 11:22:12 +01:00
Shannon Deminick
f7d28d769a
Merge pull request #886 from bjarnef/dev-v7-U4-7362
...
Add message to login screen if Caps Lock is on
2015-11-25 11:01:47 +01:00
Shannon Deminick
0edb71f4aa
Merge pull request #917 from bjarnef/dev-v7-move-umb-version-in-dialog
...
Move Umbraco version label to header in user dialog
2015-11-25 10:51:36 +01:00
Claus
1353b0a592
Reordering flex properties - recess module crashes with out of memory exception if they are in the other order.
2015-11-24 10:35:54 +01:00
Claus
617fec171f
Merge branch 'U4-6657-mediapicker' of git://github.com/arknu/Umbraco-CMS into arknu-U4-6657-mediapicker
2015-11-24 10:33:04 +01:00
Tommy Enger
c9f57c6ce3
Split Get and Post
...
Split Get and Post into 2 separate methods to maintain backwards
compability
2015-11-23 15:52:36 +01:00
engern
54ab26e2ed
Simplifying thge code even further
...
Realized that we don't need to convert the exisitng dictionary to a new
dictionary.
2015-11-21 14:00:58 +01:00
engern
31dc1b2cdb
Fixes U46340
2015-11-21 13:20:13 +01:00
Claus
d4b9a711c6
Merge pull request #919 from umbraco/temp-U4-4641
...
Fixes: U4-4641 Feature Request: template and code editors should have insert Section, Define section buttons
2015-11-20 13:41:50 +01:00
Claus
9521742254
Fixes to MultiNodePicker when using media.
2015-11-20 13:17:28 +01:00
Claus
cdc4435f2d
Merge branch 'feature/U4-5764-node-picker-info' of git://github.com/Nicholas-Westby/Umbraco-CMS into Nicholas-Westby-feature/U4-5764-node-picker-info
2015-11-20 11:47:48 +01:00
bjarnef
a885840b9f
Move Umbraco version label to header in user dialog
2015-11-19 21:55:54 +01:00
Shannon Deminick
9479d63cba
Merge pull request #899 from Acentrage/U4-7219
...
Fixes U4-7219
2015-11-19 19:24:24 +01:00
Simon Busborg
8053db32b6
code comments
2015-11-19 15:40:38 +01:00
Simon Busborg
775a6f80ea
Added comments to support the changes
2015-11-19 11:47:49 +01:00
Simon Busborg
5bf8b8ecba
Used less function 'fade' instead of random color
2015-11-19 11:44:33 +01:00
Simon Busborg
397ef32665
Added hover & active state to input-label--small
2015-11-19 11:40:29 +01:00
Simon Busborg
2634e33f51
Used @fontSizeLarge variable to determine font-size for panel-dialog--header
2015-11-19 11:27:56 +01:00
Simon Busborg
6e27caa547
Added comments and notes
2015-11-19 11:11:09 +01:00
Simon Busborg
9c027dcdbc
some ui love for the panel dialogs
2015-11-19 10:32:17 +01:00
Sebastiaan Janssen
887111318f
Update install facts
2015-11-18 20:35:36 +01:00
Claus
6e53291877
Fixed up a few things.
2015-11-17 13:42:00 +01:00
Claus
bb78f756c7
Merge branch 'Jeavon-U4-4641' into temp-U4-4641
2015-11-17 12:47:18 +01:00
Claus
ffb0de4050
Merge branch 'U4-4641' of git://github.com/Jeavon/Umbraco-CMS into Jeavon-U4-4641
2015-11-17 12:46:24 +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
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
73d5a3f993
Merge branch 'opelpanfan-UKFest-U4-6511' into dev-v7
2015-11-16 15:31:29 +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
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
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
eaf64d1814
Increased timeout from 200 to 1000 ms so you can actually type something and added support for manually submit with enter without waiting for the timer.
2015-11-12 15:33:49 +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
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