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

3005 Commits

Author SHA1 Message Date
Simon Busborg
cd2e810299 Removed "message" on no times in media section 2015-11-11 11:42:02 +01:00
Simon Busborg
55cac7990e Added dropzone upload to listview in media section 2015-11-11 11:42:02 +01:00
Simon Busborg
25db6ed430 More efficient empty state 2015-11-11 11:42:02 +01:00
Simon Busborg
d68a9fae5d UI Polish 
New: UI Polish
Edit: Changed 'Cancel' to 'Clear selection'
Fix: Changed from table to flexbox
 2015-11-11 11:42:02 +01:00
Simon Busborg
64117239ae Correction to table class 2015-11-11 11:42:01 +01:00
Simon Busborg
608aa269f9 Add umb-table directive, restyling, use directive in listview 2015-11-11 11:42:01 +01:00
Shannon
a351f6cfc8 Fixes up the error handling with move/copy dialogs. 2015-11-09 17:58:43 +01:00
Shannon
85e5c0c219 fixes jquery reference issue (again) 2015-11-09 17:10:33 +01:00
Shannon
a0761b92b8 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/RevertToCleanInstall.bat
	build/RevertToEmptyInstall.bat
	src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js
	src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbavatar.directive.js
	src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/views/components/application/umb-avatar.html
	src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html
 2015-11-09 12:33:53 +01:00
Shannon Deminick
974c7cb48c Merge pull request #882 from umbraco/temp-U4-7351 
Temp u4 7351
 2015-11-09 03:28:41 -08:00
Claus Jensen
33d7292cb1 Merge pull request #843 from umbraco/temp-U4-7224 
Temp u4 7224 - clean up content type editor validation styling
 2015-11-06 12:58:57 +01:00
Mads Rasmussen
06a1899edf clear alias when name is empty 2015-11-06 11:49:01 +01:00
Claus Jensen
16126c2b4e Merge pull request #881 from umbraco/temp-U4-7281 
show warning when editing data type in content type editor
 2015-11-06 10:30:08 +01:00
Mads Rasmussen
3dbd738639 set new bottom height to make room for cancel button 2015-11-05 10:52:22 +01:00
Mads Rasmussen
a34431493e remove watchers on available and selected models from umbChildSelector directive to prevent digest loop going crazy 2015-11-05 10:37:23 +01:00
Mads Rasmussen
6e1dc87996 wait for content before loading sub views 2015-11-05 10:32:12 +01:00
Mads Rasmussen
2f16aa25c3 Fixes: U4-7347 Document type editor template name and alias get set to null 2015-11-03 19:49:00 +01:00
Mads Rasmussen
127afbfbf1 show warning when editing data type 2015-11-03 10:48:56 +01:00
Mads Rasmussen
b632beb067 set title attr on alias input 2015-11-03 10:13:02 +01:00
Shannon
79f04bf939 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-10-29 11:57:07 +01:00
Shannon
9ab90595e2 Adds a filter to the interceptor to ignore errors for certain requests. 2015-10-29 11:56:23 +01:00
Sebastiaan Janssen
51b618826c Merge pull request #844 from ryanmcdonough/UKFest-U4-7151 
Update database placeholder to backslash for instance name.
 2015-10-29 11:16:56 +01:00
ryanmcdonough
04c28e5006 Update database placeholder to backslash for instance name. 2015-10-29 09:56:22 +00:00
Sebastiaan Janssen
c3a60ea0e0 Merge pull request #838 from ryanmcdonough/U4-7302 
Login overlay now higher than bootstrap datepicker
 2015-10-29 09:19:42 +01:00
Sebastiaan Janssen
4259b02b8d Merge branch 'dev-v7' into temp-U4-5963 
Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
 2015-10-28 16:56:40 +01:00
Shannon
e6773dafc1 Updates PR to only display the prop alias in the title attribute when in debug mode. U4-4794 Display the property alias for content properties & provide a link to the content type from the generic properties tab 2015-10-28 12:45:15 +01:00
Shannon Deminick
c0997e1b9f Merge pull request #817 from tobbbe/hooverpropforalias 
Hoover a property in backend to get its alias
 2015-10-28 12:31:20 +01:00
Shannon
64c983eb07 Updates PR with fixes for code and implementation logic for the url list. 2015-10-28 12:28:29 +01:00
Mads Rasmussen
58f21fb028 make sub view icon red if it has validation errors 2015-10-28 10:44:34 +01:00
Mads Rasmussen
ac0d47122c fix validation styling a bit 2015-10-28 10:44:34 +01:00
Mads Rasmussen
56e6eee852 fix issue with focus on locked field not being focused after child element has been added 2015-10-28 10:44:34 +01:00
Mads Rasmussen
c3441d54bf fix locked field alignment 2015-10-28 10:44:34 +01:00
Shannon
6269e7b3f2 Merge remote-tracking branch 'origin/dev-v7-contenttypeeditor' into 7.4.0 2015-10-27 11:41:45 +01:00
Shannon Deminick
283de5a7d6 Merge pull request #831 from umbraco/temp-U4-7178-media-library 
Temp u4 7178 media library
 2015-10-27 11:41:10 +01:00
Shannon
8f7add203e Merge remote-tracking branch 'origin/dev-v7-contenttypeeditor' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
 2015-10-27 10:29:11 +01:00
Mads Rasmussen
3033b0a705 Fixes: U4-7303 Shift + select to select a range of items 2015-10-27 08:53:53 +01:00
ryanmcdonough
780937dae9 Login overlay now higher than bootstrap datepicker 2015-10-26 15:49:55 +00:00
Mads Rasmussen
6faf4c4dbf Merge pull request #814 from umbraco/dev-v7-contenttypeeditor-validation 
U4-7119 New Content Type editor requires server side validation wired up
 2015-10-23 09:34:29 +02:00
Daniel
ef091e8c3a U4-7296 
http://issues.umbraco.org/issue/U4-7296
 2015-10-22 23:41:18 +02:00
Mads Rasmussen
8d81d9922c fix js errors when unsubscribing events 2015-10-22 20:27:29 +02:00
Mads Rasmussen
4007ece6b4 Add copy bulk action to content + redo move dialog 2015-10-22 19:52:56 +02:00
Shannon Deminick
e3bade4d1a Merge pull request #816 from Jeavon/U4-7260 
Fix for U4-7260
 2015-10-22 18:08:23 +02:00
Shannon
63be12b9fe Merge branch 'dev-v7-U4-6967' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-6967 
Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
 2015-10-22 18:03:03 +02:00
Per Ploug
49991ca84a Merge branch 'temp-U4-7178-media-library' of https://github.com/umbraco/Umbraco-CMS into temp-U4-7178-media-library 2015-10-22 17:29:55 +02:00
Mads Rasmussen
9372b1df47 fix placeholder width on input auto resize in firefox 2015-10-22 14:02:18 +02:00
Mads Rasmussen
83d16c3986 remove z-index on list view settings to allow overlays inside 2015-10-22 12:48:19 +02:00
Mads Rasmussen
a6cb2a38ac remove margin 2015-10-22 12:47:19 +02:00
Shannon
41c5f6a8bf Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
 2015-10-22 12:12:03 +02:00
Mads Rasmussen
cf09603c08 check for array in media grid 2015-10-22 11:52:29 +02:00
Mads Rasmussen
4975ab870b remove sortable in content grid until we find a solution for saving 2015-10-22 11:47:35 +02:00