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

2460 Commits

Author SHA1 Message Date
Sebastiaan Janssen
bd5823f0de Merge branch 'U4-7312-2' of https://github.com/Phosworks/Umbraco-CMS into Phosworks-U4-7312-2 2016-01-12 13:24:42 +01:00
bjarnef
ba0da15f7f Set focus on input by clicking label 2016-01-07 01:04:55 +01:00
Shannon
726416fe0c Fixes: U4-7624 Datepicker Sql server error 
Since we are not saving the formatted value, don't try parsing the date with formatting config.
Added in explicit parsing format compatible with the one used when saving the value, just to ensure parsing is done the same way.
 2016-01-05 15:47:42 +01:00
Shannon Deminick
1957d8bb3b Merge pull request #928 from kiasyn/patch-1 
U4-7400 - Datepicker is not updating scope model value in time for 3r…
 2016-01-05 15:19:31 +01:00
Wincent
53f9e104ec Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into U4-7312-2 
Conflicts:
	src/Umbraco.Web/Editors/ImagesController.cs - Removed changes from upstream
 2015-12-19 11:16:30 +01:00
Claus
f5e9151ffd Localized some texts on the slider configuration. 2015-12-15 15:42:14 +01:00
bjarnef
5a9dd11a7c Change margin-top for triangle and re-order config properties 2015-12-15 15:42:14 +01:00
bjarnef
9e6123abd3 Modify properties and styling 2015-12-15 15:42:13 +01:00
bjarnef
6c3ef2aaa9 Add more config properties 2015-12-15 15:42:13 +01:00
bjarnef
88fadcf74e Add slider bootstrap-slider v5.2.6 
Add newer version of script and add addtional properties.
 2015-12-15 15:42:12 +01:00
Sebastiaan Janssen
d5f9dfecc4 U4-7496 Backoffice dropdowns quit working in Chrome after update to v47.0.2526.73 
#U4-7496 Fixed
 2015-12-08 13:54:56 +01:00
hartvig
68a4749917 Fixing a little typo 2015-12-07 11:11:02 +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
Wincent
5d9bde807e Changes GetBigThumbnail to image processor in mediahelper.service.js and fileupload.controller.js 
Changed ImageController.GetBigThumbnail to redirect
Changed thumbnail paths to include rnd equal to UpdateDate
 2015-12-03 17:27:47 +01:00
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
kiasyn
dbece874dd U4-7400 - Datepicker is not updating scope model value in time for 3rd party plugins 
Force set scope model value when the datetime changes, rather than just on formsubmit. This means that 3rd party plugins (such as grids) can use this editor.
 2015-11-25 10:25:00 +13: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