Commit Graph

1827 Commits

Author SHA1 Message Date
hartvig
e481f4e0af Adds the new resize logic to the Richtext Editor (tinymce) as well 2012-07-04 09:15:16 -02:00
Matt@MBP-PC.Home
5568ea8e78 Merge 2012-07-04 09:57:08 -01:00
Matt@MBP-PC.Home
561e85804f Fixed issue with build script overwriting local config files when run locally. Now only works if ProjectDir and WebProjectOutputDir are different. 2012-07-04 09:56:24 -01:00
hartvig
ac4855e16f Adds support for auto setting file related properties through configuration (width, height, length and extension) and adds support for transparent thumbnails (at last!). Work items: 29167 2012-07-04 08:56:18 -02:00
sitereactor
5926cba4bf Merge 2012-07-04 07:10:27 -02:00
sitereactor
5e5274632c Removing Deep Linking feature from main branch 2012-07-04 07:08:24 -02:00
Matt@MBP-PC.Home
0b69d2b447 Merge with 4.8-tinymce-wip 2012-07-04 07:04:02 -01:00
Matt@MBP-PC.Home
1cc7016831 Fixed issue with TinyMCE insert link dialog not showing Target / Anchor dropdowns 2012-07-04 06:41:31 -01:00
Matt@MBP-PC.Home
3b34065713 Merge with 4.8.0 2012-07-04 06:11:32 -01:00
Matt@MBP-PC.Home
93d13d7696 Added missing TinyMCE media plugin files 2012-07-04 06:06:37 -01:00
leekelleher
7e24e433bc Merge 2012-07-03 22:36:35 -01:00
leekelleher
0cba90c81d Examine: Updated assemblies to v1.4.2 (fixes an "Inheritance security rules violated" exception within TypeFinder) 2012-07-03 22:31:04 -01:00
hartvig
9a95c08271 Adds better support for simpler file attachment to document/media properties, by just assigning an HttpPostedFile as the value of an upload property (then it'll handle storing the file, generating thumbnails, etc):
myImage.getProperty("mainImage").Value = Request.Files[0];
Adds helper class "UmbracoFile" for easier file upload / file manipulation in general (to be provider based so we can support manipulation via ImageGen or ImageResizing.NET as well as support for abstracting file storage via providers (through an IFile but currently in an implementation that needs refactoring (used in a wrong way atm)). Will fix that part tomorrow!
2012-07-03 20:58:50 -02:00
leekelleher
ff079be3ff Merge 2012-07-03 19:14:52 -01:00
Matt@MBP-PC.Home
2078873fbb Undone previous "Show Label" fix and applied at the database layer (Un-tested) 2012-07-03 18:04:56 -01:00
leekelleher
5ce472b681 umbraco.presentation.targets: Fixed path for 'ProjOutputDir'. 2012-07-03 15:46:23 -01:00
leekelleher
6e0c4b7fdb Fixes work item: 30805 - Problems logging out.
#U4-88 - MySQL error when logging out of 4.7.2.
Tested against MySQL 5.1.
2012-07-03 14:56:07 -01:00
Matt@MBP-PC.Home
e3e4254de6 Set TinyMCE data type to default to showing the label 2012-07-03 14:05:08 -01:00
sitereactor
787afa3c36 Updating SQL Create and Update scripts to be SqlAzure compatible 2012-07-03 09:08:54 -02:00
Matt@MBP-PC.Home
b2e93d2470 Fixed issue with Macro dialog not closed when inserting macro into RTE (http://twitter.com/kolchy/status/220068628140269570) 2012-07-03 07:48:07 -01:00
Matt@MBP-PC.Home
57bf3c0906 Fixed issue with build script copying config files to wrong location 2012-07-03 07:10:50 -01:00
Matt@MBP-PC.Home
11f516baf5 Replaced corupt sdf file 2012-07-03 07:01:35 -01:00
Matt@MBP-PC.Home
a3afd818c2 Removed missing files from project 2012-07-03 06:59:18 -01:00
leekelleher
0b0454526e Default SQLCE4 file was corrupted, restored from OLD/assets, works again. 2012-07-02 19:38:41 -01:00
Matt@MBP-PC.Home
8cae30ab17 Upgraded TinyMCE 2012-07-02 12:30:00 -01:00
Matt@MBP-PC.Home
299ffc4973 Upgraded TinyMCE 2012-07-02 12:28:22 -01:00
Matt@MBP-PC.Home
1190570435 Upgraded TinyMCE 2012-07-02 12:27:59 -01:00
Matt@MBP-PC.Home
10fce799d0 Creating TinyMCE Wip branch 2012-07-02 06:38:05 -01:00
Matt@MBP-PC.Home
d70bd3311f Fixes broek build 2012-06-29 12:40:10 -01:00
Matt@MBP-PC.Home
e9d7ec05b3 Merge 2012-06-29 12:33:41 -01:00
Matt@MBP-PC.Home
a993b1e736 Updated build script to include SQL CE by default
Updated build script to also generate a WebPi zip
2012-06-29 12:33:08 -01:00
leekelleher
6611e3494d Merge 2012-06-29 10:39:16 -01:00
Matt@MBP-PC.Home
1a414d1670 Moved WebPi code to src folder 2012-06-29 10:35:35 -01:00
leekelleher
ebcb8d3683 Merge 2012-06-29 10:33:06 -01:00
leekelleher
eed13fcfda Fixed workitem:29297 - overloaded mssql db reads caused by creating styles on a stylesheet for use in the richtexteditor styles drop down (tinymce).
Patch supplied by @tentonipete (unable to create fork/PR)
2012-06-29 10:32:20 -01:00
Matt@MBP-PC.Home
711e8c820a Merge 2012-06-29 10:12:34 -01:00
Matt@MBP-PC.Home
8fa73e19c2 Removed site.py script as no longer needed 2012-06-29 10:12:01 -01:00
leekelleher
f513fb52c0 Merge 2012-06-29 09:32:07 -01:00
leekelleher
81e4840ea3 Corrected the reference to my Web.config transform file - sorry! 2012-06-29 09:31:18 -01:00
Matt@MBP-PC.Home
51bc5649a3 Fixed a couple of issues after last merge 2012-06-29 09:14:12 -01:00
Matt@MBP-PC.Home
3ff846431c Merge 2012-06-29 09:10:38 -01:00
Matt@MBP-PC.Home
0bd5bc580a Fixed broken build script
Updated config templates to be dependant files so appearing underneath the real file. Build script has been updated to use these when preparing for a build. I think this makes it more obvious, as previously templates were heald elswhere and was easy to forget.
Removed config templates for files which are auto generated.
2012-06-29 09:09:32 -01:00
leekelleher
43abe02432 Merge 2012-06-29 08:16:54 -01:00
leekelleher
695832fa61 Fixes workitem:30866 - Add clickable label on publish dialog 2012-06-28 22:10:33 -01:00
leekelleher
8e491c0b1f Relation Types: Relocated the editor pages to the 'developer' section, as to match the other back-office developer trees.
Corrected paths for the relocation.
2012-06-28 21:56:28 -01:00
leekelleher
5473c6fc4f Relation Types: Relocated the tree class to match the other back-office developer tree classes.
Added to trees.config (template and working/dev copy)
2012-06-28 21:36:36 -01:00
leekelleher
f69dc80adb Updated my Web.config transform with Medium Trust settings - for testing/assurance. 2012-06-28 20:58:16 -01:00
leekelleher
7c3ba42303 Merging changes from darrenferguson/issueU484 2012-06-28 20:44:03 -01:00
leekelleher
90788a83f0 Added my Web.config transform template file. 2012-06-28 20:37:26 -01:00
Matt@MBP-PC.Home
89418ca95e Merge with 4.8-apptreexml-wip 2012-06-28 13:26:01 -01:00