yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,197 Commits 4 Branches 7 Tags
8a1dd96294c77b81fd2a0f96f70f5c41cff29af3
Commit Graph

1518 Commits

Author SHA1 Message Date
antoine
8a1dd96294 some styles fixed 2014-05-14 19:15:43 +02:00
antoine
67bebd0d2d index.html missing 2014-05-14 18:39:25 +02:00
antoine
4f34fbd2c8 devices preview better look 
tested in chrome/firefox/IE
 2014-05-14 18:37:44 +02:00
antoine
8cda6e4062 Tuning panel include in preview mode 2014-05-14 14:51:58 +02:00
antoine
39ede8c47a Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-05-13 13:07:38 +02:00
antoine
fec84b8ce3 iframe 100% in firefox 2014-05-13 13:04:39 +02:00
antoine
a00e5d54aa rename tuning project without usky 2014-05-13 12:50:48 +02:00
per ploug
6c36f43276 Adds support for loading custom RTE settings into the grid 2014-05-13 12:35:08 +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
9f116c00d5 Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.1.2-Usky 2014-05-12 20:00:57 +02:00
antoine
7e61b25746 uskytuning with style suggest and preview device 2014-05-12 19:57:06 +02:00
per ploug
482750ab6a Missing file 2014-05-12 13:22:58 +02:00
per ploug
40d1099fbd grid modifications 2014-05-12 13:22:57 +02:00
antoine
103f4f33bd Only one less style file 2014-05-10 15:56:36 +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
af732955fb Fixes up a bit more with tags look ahead, fixes up rte to show a loading... text so the UI is handled much better 2014-05-06 18:06:41 +10:00
Shannon
683f0c5725 Fixes: U4-4503 Tags datatype does not autocomplete 2014-05-06 14:44:24 +10:00
Shannon
6827def8ba Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2 2014-05-06 10:41:10 +10:00
per ploug
dbbe3fe5fb Removes remaining yepnop dependencies 2014-05-05 12:59:34 +02:00
Shannon
d2a20b10aa nearly got tag typeahead working 2014-05-05 19:07:57 +10:00
Shannon
27e6b8c80c Adds bower to node dependencies, uses bower to get the typeahead dependency, gets bower dependencies on npm install 2014-05-05 15:55:48 +10: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
Shannon
e23d7d1af3 Fixes: U4-3404 Pressing preview should save the changes and then open preview window 2014-04-29 15:09:01 +10:00
Shandem
4b97eb2a9a Merge pull request #354 from JackieNagel/link-picker-issue 
fix for issue U4-4707 - When a mediaitem is selected in the linkpicker, the id is not returned
 2014-04-29 14:03:48 +10:00
Shandem
475e6970f9 Merge pull request #356 from mattbrailsford/7.1.2-rtetinymcecheck 
Added check to rte controller so as not to reload tinymce script
 2014-04-28 12:32:15 +10:00
Shannon
c6e3340be1 Updates an error msg for media resource, performs a null check 2014-04-24 11:58:18 +10:00
Ben Norman
8556cf5702 Update README.md 2014-04-21 19:32:36 +10:00
Sebastiaan Janssen
1c0038ead3 Fixes U4-4726 Image Cropper Listed Dimensions Inversed From Settings 2014-04-21 10:58:15 +02:00
mattbrailsford
d66998a3e3 A better test (checks to see if it's even defined) 2014-04-18 15:52:26 +01:00
mattbrailsford
fe4da60b15 Added check to rte controller so as not to reload tinymce script if it's already loaded (we don't check the CSS, but I figure this is ok) [This is temp bandaid for #U4-4724] 2014-04-18 15:43:36 +01:00
Shannon
51309e62ec Fixes: U4-4714 Sql Azure no longer a database option in 7.1 2014-04-17 19:55:17 +10: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
Shannon
5697809ce9 Merge branch '7.1.2' of https://github.com/umbraco/Umbraco-CMS into 7.1.2 2014-04-14 18:33:04 +10:00
Shannon
4f5cae55c2 Fixes: U4-4654 7.1.1 InsertMacroController unescapes objects to string 2014-04-14 18:32:28 +10:00
Sebastiaan Janssen
e5b4769109 Remove test code 2014-04-14 09:27:25 +02:00
per ploug
e3c4ed5bf7 Changes grunt to accept a buildversion param 
use grunt build --buildversion=7.1.2 to set it in all client files
 2014-04-10 14:25:26 +02:00
perploug
0bedf09f48 Fixes: U4-4609 v7.1 Media Picker datatype only allows selection of images not PDFs 2014-04-08 11:34:42 +02:00
perploug
41ad18deef Removes autocomplete from installer password field 2014-04-08 11:07:23 +02:00
perploug
4745be4765 Fixes missing listview icons 2014-04-08 11:07:02 +02:00
Sebastiaan Janssen
3c204da150 Spelling error 2014-04-07 16:05:21 +02:00
perploug
08d74e3320 Tiny tweak more 2014-04-03 14:01:25 +02:00
perploug
98fd75b55d Updating user screen on the installer 2014-04-03 13:52:18 +02:00
perploug
807778a737 Fixes: U4-4592 U7.1 - You can trigger a lot "Unsaved changes" bars 2014-04-03 11:50:50 +02:00
perploug
256fa3385a Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-03 09:31:47 +02:00
perploug
ebaa46b2fc Fixes: U4-4212 Insert Image in RTE not resizing image 2014-04-03 09:31:32 +02:00