ad927ec6c1
Merge pull request #53 from abryukhov/patch-1
...
Update of ru.xml with latest keys
2013-07-19 06:20:55 -07:00
96c38f50e4
Merge pull request #49 from lars-erik/6.1.3
...
Prettifying norwegian translation
2013-07-19 06:17:48 -07:00
e723f1169f
Merge pull request #48 from marc303/patch-1
...
Updated DE to 6.1.2
2013-07-19 06:16:48 -07:00
914005b2b6
Merge pull request #46 from michielvoo/u4-2417
...
U4-2417 Could the preview thumbnail link to the full image
Conflicts:
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs
src/umbraco.editorControls/mediapicker/mediaChooser.cs
2013-07-19 15:09:07 +02:00
67bd303173
Merge pull request #46 from michielvoo/u4-2417
...
U4-2417 Could the preview thumbnail link to the full image
2013-07-19 06:02:51 -07:00
972b903f52
Merge pull request #32 from AndyButland/wip-u4-1285
...
Fix for U4-1285: Apostrophes in member groups cause exceptions
2013-07-19 14:40:28 +02:00
20e6843bf0
Merge pull request #32 from AndyButland/wip-u4-1285
...
Fix for U4-1285: Apostrophes in member groups cause exceptions
2013-07-19 05:39:38 -07:00
61d072c8d6
Fix merge issue
2013-07-19 13:32:24 +02:00
8740848aac
Merge pull request #42 from michielvoo/u4-232
...
Enabled support for integrated security for SQL Server to the installer.
Conflicts:
src/Umbraco.Web.UI/install/steps/database.ascx
2013-07-19 13:29:07 +02:00
85c80b07f9
Merge pull request #42 from michielvoo/u4-232
...
Enabled support for integrated security for SQL Server to the installer.
2013-07-19 04:26:50 -07:00
6766aa9732
Merge pull request #41 from michielvoo/u4-667
...
U4-667
2013-07-19 13:19:30 +02:00
3dea16fad1
U4-2309 BackOffice / ExamineMngr : "Optimize index" don't ends correctly when website has not members.
2013-07-19 12:39:50 +02:00
986d37afd6
Removed debugging console.log reference
2013-07-18 21:23:05 +02:00
d3fe37a080
Adds RequiredForPersistenceAttribute to easily detect if any entity fails validation in a way that it cannot be persisted to the data store. Changes all tree events to not be jquery events and to not require a 'callback' jquery object, instead we just use angular events broadcast globally, much nicer.
2013-07-18 17:05:40 +10:00
197dacfae7
Update of ru.xml with latest keys
2013-07-17 09:56:50 +07:00
c4d2c7d31a
Fixes issue with 'headline' when there is no content. Added client side validation to the content name.
2013-07-16 12:25:54 +10:00
1cd2dc8a42
Fixes U4-2436 Editing an existing property changes its alias
2013-07-15 16:52:23 +02:00
60867af1a7
Fixes U4-2444 Missing image - /umbraco/images/pinnedIcons/umb.ico
...
Also fixes casing of folder names
2013-07-15 16:31:19 +02:00
e5c758bbc1
Fixes U4-1838 uGoLive Success/Failure Images not showing
2013-07-15 16:07:42 +02:00
82cce853da
Cleans up the navigationController to not have to duplicate all props of the nav service, we just make 'nav' a property of the scope that equals the nav service.
2013-07-15 23:08:23 +10:00
7926318709
start looking at tree service to remove a node but realized that our initial app tree loading isn't correct, we need to have a true root node but currently we dont.
2013-07-15 17:05:54 +10:00
e4a72caf96
merge
2013-07-12 11:51:39 +02:00
22f6be61de
Updates yepnope, adds markown sample editor
2013-07-12 11:36:22 +02:00
e2ef802f65
Got delete working for legacy items... just need to get the tree to respond, do tree syncing, etc... but it is working.
2013-07-12 14:36:35 +10:00
de2660cfb2
Merge branch '4.11.7---ITask-updates' into 7.0.0
...
Conflicts:
.gitignore
.hgtags
src/Umbraco.Core/XmlExtensions.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/dialogHandler_temp.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
2013-07-12 11:30:06 +10:00
deceec3fa2
Merge remote-tracking branch 'origin/6.1.3' into 7.0.0
...
Conflicts:
src/Umbraco.Core/Models/Membership/IUser.cs
src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/packages.config
src/umbraco.businesslogic/packages.config
src/umbraco.cms/Actions/ActionNew.cs
2013-07-12 11:03:49 +10:00
9d2c3865ed
Updated icon mappings and updated to latest font-awesome but I have no idea how to make the font-awesome.min.less file from the download... will leave for Per :)
2013-07-11 11:03:03 +10:00
410b664f7f
Got legacy create dialogs working
...
Its not pretty, but it works, and over time these hacks should slowly
fade away
2013-07-10 15:35:38 +02:00
0f207b01f2
Integrated auth into the UI project and unit tests (you need to log in each time with arbitrary username/password). Fixes authorization, the auth check SHOULD return a 401 so that the MainController re-fires the auth check in order to re-set the 'authenticated' scope flag. Fixed err caused by trying to launch login dialog too many times when too many http calls fail. Converted over authResource to use correct resourcePromise structure. The mock auth is done with angular cookies, so integrated that too. Removes main.js since we don't use it anymore. Fixes media mocks. Removes call to get sections in navigationService since it is irrelevant and causing more issues when not authenticated.
2013-07-10 13:24:28 +10:00
5af57d9667
Fixed up the 401 issue with checking authentication which led to other issues of lazy loading in the legacy js tree JS block.
2013-07-09 21:01:29 +10:00
1272a7c74b
Prettifying norwegian translation
...
Removed obsolete, translated new, removed incorrect spacing and
hyphenation, misc. improvements in term usage. Ref.
http://i18n.skulelinux.no/nb/Fellesordl.eng-no.html .
2013-07-09 12:56:13 +02:00
76c6d952f3
Fixed up the 401 issue with checking authentication, but now have other auth issues... but better than before :)
2013-07-09 20:13:26 +10:00
dcbe6726b0
Updated DE to 6.1.2
...
Markup encoded instead of CDATA blocks
2013-07-09 10:30:20 +02:00
fdabd945dc
Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3
2013-07-09 11:48:03 +10:00
cc91977e94
Fix notification-email link to unpublished page
...
http://issues.umbraco.org/issue/U4-2482
I've added links to language files which did not contain it.
I used the %5% syntax in the sv.xml file which seems to otherwise use
{5} syntax
2013-07-09 11:19:51 +12:00
df98ad4edf
Sets the installer redirect to umbraco/default
2013-07-08 15:54:07 +02:00
90b94f6ffb
Fixes: #U4-2476
2013-07-08 18:58:38 +10:00
f51306b0e2
Removed js redirect from logout.aspx
2013-07-05 16:10:00 +02:00
0c3d274232
merge
2013-07-05 14:27:26 +02:00
852fe4210a
Removes left-col leftover file, adds contentLoaded to contentEdit controller
2013-07-05 14:26:43 +02:00
1b03dbd9c2
Adds compat.js click registering, adds bg load
2013-07-05 14:22:19 +02:00
cfd299562e
rename umb leftcol to umb navigation
2013-07-05 12:58:36 +02:00
63495d05e1
merge
2013-07-05 11:05:43 +02:00
93def731ef
Fixes #U4-2466
2013-07-05 10:51:19 +02:00
0a08dce8f5
Modifies the dialog css class loading and allows for left side modals
2013-07-05 10:48:12 +02:00
0030488b61
Fixes dialog service instant closing modals
2013-07-05 10:40:28 +02:00
d9e79666ca
css-template editor tweaks, more compat polish
2013-07-04 13:33:06 +02:00
a984bf0d68
Fixes failing tests
...
Adds a seperate unit test app loader, removes e2e backend from tests
adds scope.digest and httpbackend.flush to tests
2013-07-04 09:28:27 +02:00
93844f30ac
Re-fixed the section icons, deals with legacy icons, new icons and legacy file based icons
2013-07-04 12:50:25 +10:00
0f06308efc
removed VS build events, hopefully that can kick start the build server
2013-07-04 12:36:28 +10:00
Sebastiaan Janssen