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

1708 Commits

Author SHA1 Message Date
warrenbuckley
29afebdb60 Initial starting work on ng-doc fleshing out for auth.resource.js (Also to see if Core team happy with this before investing too much time) 2014-08-26 15:08:40 +01:00
warrenbuckley
9784a3d868 Add new Grunt Task 'docserve' to rerun ng-docs task & spin up a test server to browse to along with new watch task to recompile generated docs 2014-08-26 15:07:40 +01:00
Shannon
da8469e4e4 Merge branch 'Nicholas-Westby-7.1.5' into 7.2.0 2014-08-25 17:02:12 +10:00
Shannon
16a4e425cb Merge branch '7.1.5' of https://github.com/Nicholas-Westby/Umbraco-CMS into Nicholas-Westby-7.1.5 2014-08-25 17:01:56 +10:00
Shannon
e2d04e2b3a Merge branch '7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/modals.less
	src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs
 2014-08-24 21:35:08 -06:00
Sebastiaan Janssen
5752bb0d18 Merge pull request #412 from BatJan/7.1.5-ux-4913 
Fix for U4-4913
 2014-08-19 14:20:47 +02:00
Sebastiaan Janssen
a0f5a717f2 Merge pull request #410 from BatJan/7.1.5-installer-fix-4493 
Fix for U4-4493
 2014-08-19 14:18:10 +02:00
Sebastiaan Janssen
8b34b4e8a1 Merge pull request #416 from Graphicnerd/7.1.5 
Updated the sortable frame in Umbraco Backoffice
 2014-08-19 14:02:28 +02:00
Sebastiaan Janssen
6152079af1 Merge pull request #450 from bjarnef/7.1.5 
Fix for U4-5313 and U4-5330
 2014-08-19 13:44:02 +02:00
per ploug
3a0a839503 Increasing the search debounce from 100 to 300ms 2014-08-19 00:04:53 +02:00
Shannon
f4c2b7419a Fixes: U4-4782 Duplicate content after validation error correction 2014-08-18 15:02:45 -06:00
Shannon
bbe8c8e8e6 moves no-dirty-check directive to validation folder 2014-08-18 14:49:41 -06:00
Shannon
49d1171a99 renames utill folder to have a single l 2014-08-18 14:48:36 -06:00
Shannon
895ecf5f16 Merge branch 'u4-5003' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-5003 2014-08-18 11:38:09 -06:00
Kevin Giszewski
42dd38fb29 Add caching to the RTE config 2014-08-18 09:23:46 -04:00
Shannon
1686e2f4bf Fixes: U4-5333 Datepicker starts on today's date instead of current value when you switch nodes 2014-08-15 13:48:07 -06:00
Shannon
f6abb0f603 fixes more of the photo arrangements in the photo folder which also fixes unit tests 2014-08-15 11:58:41 -06:00
Shannon
ac55724231 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-08-15 09:34:47 -06:00
bjarnef
d978db588c Fix for U4-5313 and U4-5330 
Make the bottom bar overlap the image cropper focal point and display
the scrollbar if there is overflow. I know the buttons are located a bit
(10px) closer to the top, but you can see the horizontal scrollbar then,
when there is one in e.g. a package. E.g. depending on the screen
resolution, I would in Matrix Property Editor (There is no spoon) prefer
the Umbracos editing section to scroll than add scroll inside the
property editor wrapper, because it give more editing space.
 2014-08-15 01:06:20 +02:00
AndyButland
beda0968ae Removed debug line 2014-08-14 18:07:21 +02:00
AndyButland
f6ec4798a6 Prevented list view filter box from setting dirty flag on form. Without this you get the save changes warning after using the filter, but there's nothing to save. 2014-08-13 22:11:41 +01:00
AndyButland
096e10aad4 Moved list view no results message into table body as otherwise if you apply a filter that returns no results, you can't clear it again 2014-08-13 20:06:55 +01:00
per ploug
5e738a2b7b Fixed: U4-4734 Remove default alt text on images from RTE 2014-08-13 11:01:56 +02:00
per ploug
231c50319f Fixed: U4-5343 Move grid.config out of Umbraco folder 2014-08-13 10:04:54 +02:00
antoine
15cdc85e42 Last tuning change and TXT template config 2014-08-11 13:13:39 +02:00
Shannon
247b5b648d Merge branch '7.1.5_U4-5316' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.1.5_U4-5316 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
 2014-08-08 12:29:17 -06:00
Shannon
24a6ae4e32 Fixes: U4-4634 Image preview in Media is stretched 2014-08-08 12:00:30 -06:00
antoine
05c6166040 Preview open in new tab instead of a popup (chrome) 2014-08-08 13:14:03 +02:00
antoine
9789fbdb79 tuning config for current umbraco kit starter 2014-08-07 18:11:50 +02:00
Shannon
fc19748fbf Fixes: U4-5304 7.1.4 Media Picker can't view images RangeError: Maximum call stack size exceeded 2014-08-06 11:20:24 -06:00
antoine
e701f0d8a1 new editor for the ui designer 2014-08-05 18:01:04 +02:00
per ploug
173d4c9655 Fixed: U4-4485 Unsaved changes prompt not appearing for RTE 2014-08-05 13:43:12 +02:00
Declan Cook
b2436bd9b6 Fix for issue U4-4162 - MacroContainer editing 
Allows editing of first element in a macro container.
 2014-08-04 16:07:07 +01:00
Sebastiaan Janssen
5fd59a6450 Fix merge problems 2014-08-04 13:56:51 +02:00
Sebastiaan Janssen
dba180d809 Merge remote-tracking branch 'origin/7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/lib/lazyload/lazyload.min.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
 2014-08-04 13:32:44 +02:00
Sebastiaan Janssen
1c83114c78 Merge pull request #436 from lucasch/U4-5109 
U4-5109 - Added an icon for the Visual Blocks tinymce plugin to the skins CSS files
 2014-08-04 09:11:54 +02:00
user
d6833c9b86 Updated the Umbraco TinyMCE skin to use the templates icon for visual blocks, 
Visual blocks had no icon in the css
 2014-08-01 11:58:33 -05:00
Shannon Deminick
2325c8a64f Merge pull request #434 from naepalm/7.1.5 
Updated the dictionary table icons and the CSS
 2014-07-31 18:46:29 -06:00
per ploug
d8a0502055 Updates to the grid editor 
Updates the active grid with correct width, permissions etc on config
changes
 2014-07-31 14:45:49 +02:00
Sebastiaan Janssen
84df6e5315 Merge branch 'wip-u4-3963' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-3963 2014-07-31 12:42:45 +02:00
Janae Cram
af3b655073 Updated the dictionary table icons and the CSS to make the section more usable. 2014-07-30 09:12:06 -07:00
Shannon
f8e366bb4a fixes minor bool check in js for jslint 2014-07-29 11:23:58 -06:00
arknu
cad946905c Bugfix: 0 value was ignored 2014-07-27 13:06:02 +02:00
arknu
49c26f4a5e Followup: make sure that defualt value is applied in RTE 2014-07-27 12:46:52 +02:00
arknu
45b173c0db U4-4729: Make max image dimension in RTE configurable 2014-07-27 01:25:39 +02:00
Shannon Deminick
7ab8ea4da4 Merge pull request #432 from AndyButland/u4-5138 
U4 5138 - fixed a couple of issues with list view styling and function
 2014-07-24 15:24:51 -07:00
Shannon
1e8f016234 Fixes: U4-5111 7.1.4 JavaScript runtime error: 'UmbClientMgr' is undefined 2014-07-24 15:13:41 -07:00
Sebastiaan Janssen
b1350fa4a6 Customize button was displayed lower than installer button 2014-07-24 14:40:33 +02:00
antoine
fbe49acc77 preview cell with fixed 2014-07-23 10:55:07 +02:00
antoine
677983a59e markup and layouts sortable issue 2014-07-23 09:30:33 +02:00