yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,734 Commits 4 Branches 7 Tags
5ad5e945c4e894bf9e6327c810cdc9913edc1ebb
Commit Graph

2407 Commits

Author SHA1 Message Date
Sebastiaan Janssen
5ad5e945c4 Merge pull request #813 from TimGeyssens/dev-v7 
Fixes U4-7249 Insert Macro split button, when selecting a macro that …
 2016-01-05 19:49:14 +01:00
Sebastiaan Janssen
4ef7b7735e Fixes U4-6510 again as merging PR apparently went wrong 2016-01-05 17:04:11 +01:00
Sebastiaan Janssen
db538d95ba Bumps version 2016-01-05 16:11:59 +01:00
Robert Foster
fbee58e445 Added json mimetype Mapping to web.config.template to support things like manifest.json in certain browsers (e.g. IE). 2015-12-26 19:05:44 +11:00
Robert Foster
a5e87dcedf Fix for IE not being able to install packages in Umbraco backoffice. 2015-12-26 18:57:24 +11:00
Sebastiaan Janssen
bb4994f9fc Merge pull request #935 from torerikk/dev-v7 
Update Norwegian translations
 2015-12-15 15:10:46 +01:00
Sebastiaan Janssen
80f597a7eb U4-7424 - Also update all other errors displayed in the frontend 2015-12-15 12:51:45 +01:00
Sebastiaan Janssen
0629b49112 Merge branch 'U4-7424' of https://github.com/engern/Umbraco-CMS into engern-U4-7424 2015-12-15 12:13:35 +01:00
Sebastiaan Janssen
1bf2a3b1bf Merge branch 'dev-v7' of https://github.com/TimoPerplex/Umbraco-CMS into TimoPerplex-dev-v7 
Conflicts:
	src/Umbraco.Web/Editors/ImagesController.cs
 2015-12-15 11:12:13 +01:00
Sebastiaan Janssen
a101367292 This would've stayed here for years and be irrelevant, we can link to twitter profiles in the docs on Our 2015-12-08 14:02:43 +01:00
Sebastiaan Janssen
e90fedb835 Bumps version 2015-12-08 13:54:57 +01:00
Claus
cbb84f79d1 Merge pull request #799 from esn303/patch-1 
Major revamp with keys added and texts fixed everywhere
 2015-12-08 11:40:42 +01:00
Tor-Erik Klausen
0370f9a1c8 Update Norwegian translations 
Adds missing translations and removes some old ones. Based on current
en.xml
 2015-12-02 20:09:06 +01:00
Shannon
87100feb3d Fixes: U4-7467 Umbraco 7.3.2 Clean install, OWIN error after database creation and bumps version 2015-11-27 21:23:24 +01:00
Shannon
610efe552d Bumps version 2015-11-27 16:54:02 +01:00
Sebastiaan Janssen
2c4403f892 Fixes image that was missing from the build 2015-11-26 13:08:59 +01:00
Shannon
3f7293304d removes password change dashboard from release 2015-11-26 11:55:42 +01:00
Shannon
9782e3711e Revert "Update bower.json with ngCapsLock" 
This reverts commit f0e1460550.

Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
 2015-11-26 10:54:43 +01:00
Shannon
ba4f0cc6a4 remove file that shouldn't be checked in 2015-11-26 10:35:28 +01:00
Shannon
18c3345e47 Fixes U4-7459 XSRF protection bypass - ensures tokens are checked for the non-editor api controllers 2015-11-25 19:39:24 +01:00
Shannon Deminick
f7d28d769a Merge pull request #886 from bjarnef/dev-v7-U4-7362 
Add message to login screen if Caps Lock is on
 2015-11-25 11:01:47 +01:00
Claus
9a07e206d8 Merge pull request #874 from andydale1982/U4-7323_(#871)‏ 
U4 7323 (#871)‏
 2015-11-25 10:51:41 +01:00
engern
07c714fd11 Fixes U4-7424 
Add the possibilty to change the error message when a macro partial view
fails to render.
 2015-11-21 11:33:46 +01:00
Claus
d4b9a711c6 Merge pull request #919 from umbraco/temp-U4-4641 
Fixes: U4-4641 Feature Request:  template and code editors should have insert Section, Define section buttons
 2015-11-20 13:41:50 +01:00
Sebastiaan Janssen
aca181b32e U4-7410 Version issue with MySql.Data after upgrade to 7.3.1. 
#U4-7410 Fixed
 2015-11-18 19:39:10 +01:00
Claus
bb78f756c7 Merge branch 'Jeavon-U4-4641' into temp-U4-4641 2015-11-17 12:47:18 +01:00
Claus
ffb0de4050 Merge branch 'U4-4641' of git://github.com/Jeavon/Umbraco-CMS into Jeavon-U4-4641 2015-11-17 12:46:24 +01:00
Sebastiaan Janssen
36814d746f Merge pull request #905 from GertyEngrie/dev-v7 
U4-7297 - fixes <hr/>-button in tinymce
 2015-11-17 10:34:37 +01:00
Claus
a72f6edb6b Merge pull request #846 from OptimisticCoder/UKFest-U4-6732 
U4-6732 - Added message on back office, when JS is disabled.
 2015-11-17 10:23:06 +01:00
Gerty Engrie
eb3ff12916 U4-7297 - fixes <hr/>-button 2015-11-17 00:35:10 +01:00
Claus Jensen
c46ac11125 Merge pull request #849 from mzajkowski/UKFest-U4-6282 
U4-6282  Add note to Register Partial Macro
 2015-11-16 15:37:47 +01:00
Shannon
6a7faf457b Merge branch 'dev-uk-U4-1117' of https://github.com/JeffreyPerplex/Umbraco-CMS into JeffreyPerplex-dev-uk-U4-1117 2015-11-13 11:35:29 +01:00
Shannon
f32479bb10 bumps version 2015-11-13 11:26:31 +01:00
Claus
6c47c8f792 Added danish translation. 2015-11-12 13:36:13 +01:00
Claus
63160e2e2d Removing the Change Password tab from Content section. 2015-11-12 13:31:03 +01:00
Claus
edc58fe8a5 Merge branch 'dev-uk-U4-3774' of git://github.com/JeffreyPerplex/Umbraco-CMS into JeffreyPerplex-dev-uk-U4-3774 2015-11-12 11:23:36 +01:00
bjarnef
d15c09ad2a Localize "Caps Lock is on" 2015-11-09 00:06:16 +01:00
andydale1982
a7f06ebc56 Typo Correction 2015-10-30 10:38:05 +00:00
Jeavon Leopold
38b13bf6ce Basic implementation for U4-4641 2015-10-29 17:18:40 +00:00
Jeavon Leopold
c8cb5b26b0 Basic implementation for U4-4641 Feature Request: template and code editors should have insert Section, Define section buttons 2015-10-29 17:14:45 +00:00
andydale1982
5749f80a7f Added instructions to manually install node_modules. 2015-10-29 17:10:39 +00:00
Jeffrey Schoemaker
a8a768a50f U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:24:41 +01:00
Jeffrey Schoemaker
62b99ffc59 U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:24:16 +01:00
Jeffrey Schoemaker
6b0c94948e U4-1117 - Fixed any errors when renaming /umbraco to something else 2015-10-29 16:23:30 +01:00
Jeffrey Schoemaker
71dc1110d8 U4-3774 / U4-4752 - Added a change password form to the user dialog 2015-10-29 12:38:00 +01:00
Jeffrey Schoemaker
4de4eb9cc8 U4-3774 / U4-4752 - Added a change password form to the user dialog 2015-10-29 12:34:05 +01:00
Jeffrey Schoemaker
308d5ba344 U4-3774 / U4-4752 - Added a change password form to the user dialog 2015-10-29 12:32:57 +01:00
Marcin Zajkowski
aac208c0e8 U4-6282 Add note to Register Partial Macro 2015-10-29 10:53:29 +00:00
OptimisticCoder
23fcc1ac55 Added message on back office, when JS is disabled. 
" JAVASCRIPT IS DISABLED. PLEASE ENABLE TO CONTINUE!"
 2015-10-29 10:28:49 +00:00
Shannon
1f0dc7e65d Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-10-28 18:26:44 +01:00