yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,920 Commits 4 Branches 7 Tags
e31daef4fae02f5b427b852a36cee1c90fea1e19
Commit Graph

16047 Commits

Author SHA1 Message Date
Shannon Deminick
a4f83f9c00 Merge pull request #1922 from abryukhov/patch-10 
Adding 'usernameHint' key to ru.xml lang file
 2017-04-30 17:04:30 +10:00
Shannon Deminick
85467976ad Merge pull request #1913 from umbraco/temp-U4-9824-v76 
Change username to email in login dialog
 2017-04-30 17:04:16 +10:00
Alexander Bryukhov
d7e93fe466 Adding 'usernameHint' key to ru.xml lang file 2017-04-30 11:56:47 +07:00
Sebastiaan Janssen
660f048b4f U4-9812 FailedLoginAttempts should be reset to 0 after a successfull login attempt 
(cherry picked from commit 3242b31a8a)
 2017-04-29 10:22:57 +02:00
Michael Latouche
444c444f0e Adding login hint to French language file 2017-04-29 00:03:57 +02:00
Cristhian Amaya
383bbbe7e0 Add Spanish translation for usernameHint 2017-04-28 15:19:27 -05:00
Stephan
72eddca3c6 Merge branch 'dev-v7.6' into temp-scope-events-stale-entities 2017-04-28 19:19:36 +02:00
Nicklas Kevin Frank
7c2ddde311 Fixed typo in Dokumenttype 2017-04-28 17:24:43 +02:00
Nathalie Festin
c6229e4fcb Adding login hint to Swedish language file 
Added usernamehint to placeholders
 2017-04-28 15:44:46 +02:00
Nicklas Kevin Frank
fbac0aba8b Update da.xml with translation for concierge 2017-04-28 14:56:57 +02:00
Nicklas Kevin Frank
f01511c592 Edit DA with minor spelling and compound word changes 2017-04-28 14:48:32 +02:00
Stefan Limbacher
187354f0bd Adding login hint to German language file 2017-04-28 14:29:13 +02:00
Dave Woestenborghs
2f540b1bfa Translated the usually part 2017-04-28 14:25:21 +02:00
Dave Woestenborghs
b1f104d1de Changed it to be more consisten 
Changed to be more consistent with other dutch translations
 2017-04-28 14:24:10 +02:00
Dave Woestenborghs
ba5fcad09a Added dutch translation for usernameHint 2017-04-28 14:17:51 +02:00
Niels Hartvig
d553eb2978 Change it back to username and then with a hint for email (for backwards compat.) 2017-04-28 13:57:29 +02:00
Niels Hartvig
d1e6c0e835 Change username to email in login dialog 2017-04-28 13:37:19 +02:00
Stephan
244977dc95 packages - trace errors 2017-04-28 13:34:35 +02:00
Sebastiaan Janssen
3242b31a8a U4-9812 FailedLoginAttempts should be reset to 0 after a successfull login attempt 2017-04-28 12:46:58 +02:00
Stephan
efc3261163 scope - dont break 2017-04-28 11:43:48 +02:00
Stephan
8c6aa9875d scope - dont rename 2017-04-28 11:26:41 +02:00
Stephan
f89ce1ff26 scope - cleanup 2017-04-28 10:58:57 +02:00
Shannon
1274fbaefd Fixes up the equality members for the event args types to include Gethash code and sequence equal checking, this is done by a base class used by event args that deal with collections. 2017-04-28 18:14:50 +10:00
Shannon
8140dfdc04 ads notes 2017-04-28 16:57:13 +10:00
Shannon
a69eba61c8 Fixes detecting enumerable and ensures that the event is added to the result if we can't cast to IEntity 2017-04-28 14:54:08 +10:00
Alexander Bryukhov
46078a841c Missing newest area & key from en.xml 2017-04-28 11:43:50 +07:00
Alexander Bryukhov
0eb5e5f6e4 Missing newest area & key from en.xml 2017-04-28 11:41:20 +07:00
Shannon
ec9020f63e Fixes mappings 2017-04-28 13:34:32 +10:00
Shannon
0b61685fc8 Adds ability to supersede events so we don't have an issue of saved event being raised for an entity after it's been deleted. 2017-04-28 13:26:56 +10:00
Shannon
3779b3c782 Updates base entities to contain a DeletedDate if the entity gets deleted 2017-04-28 11:15:19 +10:00
Shannon
5b0e824301 Merge branch 'dev-v7.6' into temp-scope-events-stale-entities 2017-04-28 10:32:01 +10:00
Shannon
d24b0aa9eb oops undeletes a couple files that are still needed for the custom package ascx page 2017-04-28 10:30:47 +10:00
Shannon
9cd7e09986 POC to normalize all event entities when we track events so that all args contain the latest (non stale) entity 2017-04-28 10:04:43 +10:00
Shannon
9f505a7976 bumps to rc3 version 2017-04-28 08:27:31 +10:00
Jason Woods
f737004544 Removed space before svalue 2017-04-27 16:13:41 -06:00
Jason Woods
850e354b11 wrapped all values in double quotes 
Wrapped image src and crop values in double quotes to keep consistent across all saves and updates.
 2017-04-27 16:03:45 -06:00
Shannon
1b27114014 Merge branch 'temp-CON-1267' into dev-v7.6 2017-04-28 07:53:16 +10:00
Shannon Deminick
d8b235ad62 Merge pull request #1906 from umbraco/temp-CON-1267 
CON-1267 Update Our to not offer v6 to people on < 7.6.0
 2017-04-28 07:52:19 +10:00
Shannon
56581478c8 Merge remote-tracking branch 'origin/dev-v7' into temp-CON-1267 2017-04-28 07:48:04 +10:00
Shannon
2be330d237 adds notes, changes to protected 2017-04-28 07:45:01 +10:00
Shannon
4381a700ba Updates UmbracoVirtualNodeRouteHandler to have a new protected GetUmbracoContext method used to get the umb context used in the rest of the code 2017-04-28 07:38:03 +10:00
Shannon
99821954f1 adds notes 2017-04-28 07:31:44 +10:00
Shannon Deminick
10a15be8ad Merge pull request #1901 from tompipe/U4-9384-StaleVariableFix 
Quick/simple fix for the stale variable
 2017-04-28 07:28:00 +10:00
wanddy
0a2830aece Improve Chinese translation. 
Signed-off-by: wanddy <wanddy@163.com>
 2017-04-27 22:59:17 +08:00
Stephan
d1094eea7a Merge pull request #1905 from umbraco/temp-tasks 
Publicize more IBackgroundTask plumbing
 2017-04-27 14:46:33 +02:00
Shannon
c629a50f39 Fixes entity service and figuring out which GUID to go with which object type 2017-04-27 13:29:31 +10:00
Shannon
430f906ae6 Merge remote-tracking branch 'origin/dev-v7.6' into temp-CON-1267 2017-04-27 13:28:34 +10:00
Shannon
e913034d93 Changes PackagingService to not have a different base class since it was not needed 2017-04-27 13:21:56 +10:00
Shannon
bed5f8a03b backports updates from 7.6 so that the packages.umbraco.org endpoint is not used for fetching package files any longer 2017-04-27 13:21:07 +10:00
Stephan
0291ab615d Fix shadow wrapper cleanup 2017-04-26 17:38:06 +02:00