Shannon
|
d3fcdfb176
|
updates nuget semver ref in nuspec
|
2017-04-30 23:24:26 +10:00 |
|
Shannon
|
2479c5a272
|
updates other nuget refs that shouldnt be there
|
2017-04-30 23:21:19 +10:00 |
|
Shannon
|
fee071db22
|
Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6
|
2017-04-30 23:20:16 +10:00 |
|
Shannon
|
004e00599d
|
Fixing nuget package issues , semver 2 is only for 452+ which we dont have, we shouldnt be using it and it adds more dependencies that we don't need right now
|
2017-04-30 23:19:45 +10:00 |
|
Morten Christensen
|
2e2e8b43b0
|
Merge pull request #1917 from Frozire/patch-1
Edit DA with minor spelling and compound word changes
|
2017-04-30 14:05:14 +02:00 |
|
Morten Christensen
|
e77c5f8667
|
Keep the Concierge Product name
|
2017-04-30 14:04:00 +02:00 |
|
Shannon Deminick
|
3509a2c40f
|
Merge pull request #1908 from umbraco/temp-scope-events-stale-entities
POC to normalize all event entities when we track events so that all …
|
2017-04-30 19:28:19 +10:00 |
|
Shannon
|
378d0f7939
|
chagnes test params to be slightly less hacky
|
2017-04-30 19:21:13 +10:00 |
|
Shannon
|
d64fa7f92d
|
Fixes tests, ensures we null check when generating hashes for items in a collection
|
2017-04-30 19:14:36 +10:00 |
|
Stephan
|
ea14170272
|
minor cleanup
|
2017-04-30 10:14:48 +02:00 |
|
Shannon
|
73209d7e2c
|
Merge branch 'dev-v7' into dev-v7.6
|
2017-04-30 17:13:14 +10:00 |
|
Shannon Deminick
|
cf8ead62ac
|
Merge pull request #1904 from jwoods1/patch-2
Fixed issue on line 216
|
2017-04-30 17:11:44 +10:00 |
|
Shannon Deminick
|
8461aea7d8
|
Merge pull request #1907 from wanddy/dev-v7
Improve Chinese translation.
|
2017-04-30 17:10:58 +10:00 |
|
Shannon Deminick
|
034de1651b
|
Merge pull request #1910 from abryukhov/patch-9
ru.xml - Missing newest area & key from en.xml
|
2017-04-30 17:09:30 +10:00 |
|
Shannon Deminick
|
dcb8aa7e56
|
Merge pull request #1909 from abryukhov/patch-8
en_us.xml - Missing newest area & key from en.xml
|
2017-04-30 17:09:15 +10:00 |
|
Shannon Deminick
|
e8a52a95da
|
Merge pull request #1914 from dawoe/patch-1
Added dutch translation for usernameHint
|
2017-04-30 17:08:42 +10:00 |
|
Shannon Deminick
|
42c99e0f07
|
Merge pull request #1916 from stelim/patch-1
Adding login hint to German language file
|
2017-04-30 17:08:29 +10:00 |
|
Shannon Deminick
|
a31b368b60
|
Merge pull request #1919 from NathalieLarsson/patch-1
Adding login hint to Swedish language file
|
2017-04-30 17:05:29 +10:00 |
|
Shannon Deminick
|
77f6d28a74
|
Merge pull request #1920 from camaya/patch-1
Add Spanish translation for usernameHint
|
2017-04-30 17:04:56 +10:00 |
|
Shannon Deminick
|
0b8d3ef214
|
Merge pull request #1921 from mikecp/patch-1
Adding login hint to French language file
|
2017-04-30 17:04:44 +10:00 |
|
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 |
|
Sebastiaan Janssen
|
9fa76a0133
|
Merge pull request #1911 from umbraco/temp-U4-9812
U4-9812 FailedLoginAttempts should be reset to 0 after a successfull …
|
2017-04-29 10:19:26 +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 |
|