yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,973 Commits 4 Branches 7 Tags
85ebcadcdd29b50fdaf5159c2c54a0dbfecf9ca4
Commit Graph

170 Commits

Author SHA1 Message Date
Shannon
84cac6ac90 Fixes: U4-5741 [7.2] CodeMirror in RTE has issues in IE11 & U4-5781 Update to latest codemirror 2015-06-24 19:06:42 +02:00
Shannon
40c35e5851 Fixes: U4-6582 RTE "Link To File" missing rel="nodeId" attribute 2015-06-23 10:53:56 +02:00
Shannon
be84db097a Fixes: U4-6599 TinyMCE autoresize plugin has a bug and needs to be updated, U4-5689 update to latest TinyMCE 4.x version 2015-06-17 15:06:34 +02:00
Shannon Deminick
9dc0999ebd Merge pull request #595 from redmorello/U4-6036 
U4 6036 - Checkbox and Radio button styling incorrect in backend
 2015-05-07 11:49:30 +10:00
kgiszewski
f06a468fb4 Fix for U4-6395, U4-6117 2015-03-13 11:40:04 -04:00
Shannon
d2083673be Fixes: U4-3420 Firefox v25.0 - Right click context menu doesn't work - this felt like being a web dev 10 years ago when you had to code totally differently for each browser. Firefox unfortunatley treats 'a' tags differently than anything else and combined with angular saying you can have empty 'href' tags doesn't work. In the end, the fix was easy, just remove the empty (supposed to be supported) href attributes from the 'a' tags in the tree, then the contextmenu starts working in firefox and the events can be canceled as per normal. This commit also moves the angular localization library to use bower. 2015-03-10 13:02:34 +11:00
Shannon
2834ccdc2b Fixes: U4-6344 TinyMCE RTE style_formats configuration changes 2015-03-09 17:31:29 +11:00
Shannon
cd4c738c04 Moves jquery and blueimp files to be included with bower, removes all unnecessary jquery files that are committed to the repo. Jquery and jquery ui versions remain the same, however the canvas designer was using a jquery ui version one patch version ahead so need to test that it works with the bower version, otherwise we'll have to re-include it. 2015-02-11 18:39:53 +11:00
Shannon
201464cb44 Fixes: U4-5918 Update Underscore.js and also updates our usage of bower with the correct grunt-bower plugin, this massively simplifies bower usage and paves the way to start using bower for all JS components. 2015-01-02 14:25:11 +11:00
redmorello
e5ec935128 Update forms.less 
Removed negative left margin from checkbox and radio button inputs.
 2014-12-18 11:08:44 +00:00
Shannon
2d9bd394ae Updates the codemirror plugin for tinymce so that it uses it's own alias: codemirror, so the code and codemirror plugins can be enabled individually. 2014-11-18 14:06:43 +11:00
Shannon
24695948d2 Fixes API compatibility issues with new date picker, moves moment to it's own folder since it might be used for other things. 2014-10-28 16:16:00 +10:00
arknu
0c4d574fe4 add moment.js 2014-10-27 12:57:24 +01:00
arknu
b541fe6b3f U4-5520: Localize date/time picker (with improved compatibiility and other fixes) 2014-10-27 12:56:47 +01:00
Shannon
87db6d672a Revert "U4-5520: Localize datepicker" 2014-10-27 17:47:50 +10:00
Shannon Deminick
a44123f064 Merge pull request #504 from arknu/datetimepicker-locale 
U4-5520: Localize date/time picker
 2014-10-24 12:17:45 +10:00
Shannon
ca58e8f98f Fixes: U4-4176 v7, cannot disable users in right-click-menu. 2014-10-16 18:45:02 +10:00
arknu
f5447e1bc1 remove minified version 2014-10-16 09:48:52 +02:00
arknu
a916686d2e add moment.js 2014-10-16 09:48:47 +02:00
arknu
6adf04eddc U4-5520: Localize datepicker 2014-10-16 09:48:46 +02:00
Shannon
26059ebad0 updated some of the table styling, updated the path to be relative and updated the release config. 2014-10-16 17:38:36 +10:00
Shannon
f48a218456 Merge branch 'tinymce-codemirror' of https://github.com/pynej/Umbraco-CMS into pynej-tinymce-codemirror 2014-10-16 17:06:22 +10:00
Shannon
297f564b1d removed the min version, we minify anyways. 2014-10-16 14:20:38 +10:00
Shannon
87f0586cdd Fixes date picker, ensures today's date is not shown when hiding, ensures that a null value is set when it's empty 2014-10-16 14:18:41 +10:00
Shannon
c078a1c12f Merge branch 'U4-5512' of https://github.com/arknu/Umbraco-CMS into arknu-U4-5512 
Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
 2014-10-03 13:01:00 +10:00
Shannon Deminick
69494c20f4 Merge pull request #491 from AndyButland/u4-5461 
U4-5461 - Close date picker once date is selected
 2014-10-02 21:18:21 +10:00
Shannon
c8264cff1e Updates the content type editor to have the list view customization inline instead of in a dialog. 2014-10-02 18:52:38 +10:00
AndyButland
2c871e635f Modified datetimepicker to allow passing of a view mode parameter to the hide method; called from datepicker controller to only hide on date change when in day view mode 2014-09-29 23:15:06 +02:00
antoine
8e455257ef Grid control and row sortable bug fixed and improvement 2014-09-19 11:34:35 +02:00
antoine
ef6e181eb1 control sorting with editor control (with ui.sortable last version) 2014-09-06 17:40:52 +02:00
Jeremy Pyne
3d0e74522d Fix for dialog size logic. 
Fix for css not associated with legend.
 2014-09-05 15:32:39 -04:00
Jeremy Pyne
fba6d8ec66 Added codemirror plugin to tinymce v4 used in Umbraco7. 
This is a tinymce plugin to seamlessly use the already existing code mirror package in umbraco as the source editor.
The tinymceconfig.config is updated to seamlessly replace the code plugin with the new codemirror plugin. (And the user can switch back to code here if they need to for some reason.)
 2014-09-05 15:00:54 -04: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
1e8f016234 Fixes: U4-5111 7.1.4 JavaScript runtime error: 'UmbClientMgr' is undefined 2014-07-24 15:13:41 -07:00
per ploug
83b6375f04 Migrated the Editors out of the grid 
Added configuration for individual editors, added allowed editors, new
styling refactored css
 2014-05-21 15:40:17 +02:00
per ploug
23c7eafaf5 merge from upstream 7.1.4 2014-05-20 12:32:47 +02:00
per ploug
90892ce818 adds rootscope access to umb.clientmgr 2014-05-20 12:14:10 +02:00
per ploug
e8f4e7663f More visual tweaks to the grid to handle deletes 
also rolls back a couple of bower "tweaks" that ended up being horrible
 2014-05-13 09:45:09 +02:00
antoine
e269a0b9bb Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky 2014-05-09 18:22:37 +02:00
antoine
23301817bf uSkyTuning into Umbraco core, first approach 2014-05-09 18:18:08 +02:00
per ploug
4baf3ed99a Initial commit of the grid 2014-05-09 12:23:59 +02:00
Shannon
6b6ca615ba Updates build to ignore bower and commits typeahead. 2014-05-09 17:02:14 +10:00
per ploug
dbbe3fe5fb Removes remaining yepnop dependencies 2014-05-05 12:59:34 +02:00
Shannon
956a92f5b4 removes unused moment.js from core/release 2014-05-05 13:35:20 +10:00
per ploug
d0dae43dd1 Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2 2014-04-29 11:38:29 +02:00
per ploug
90bf600378 Replaces yepnope.js with lazyload.js 
Solves the caching and multi-load of the same file problems - adds a bit
of promise-based loading logic ontop of ll.js to ensure order and count
 2014-04-29 11:38:13 +02:00
Jackie Nagel
4890e97168 Added removal of isMedia whenever a contentnode is selected 2014-04-15 19:59:31 +02:00
Jackie Nagel
e4f63c0576 Now inserting mediaId in the link picker and setting the isMedia flag so that you can get mediaId's from the linkPicker dialogservice 2014-04-15 18:07:40 +02:00