Merge pull request #204 from Automattic/develop

Merge 1.3.3
Automattic · Apr 18, 2018 · c5022af · c5022af
2 parents 6c2f75b + 3eb9244
commit c5022af
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/Simplenote/CSS/markdown-dark.css b/Simplenote/CSS/markdown-dark.css
@@ -160,11 +160,11 @@ html {
 }
 
 .note-detail-markdown table tr:nth-child(2n) {
-    background-color: #f6f7f8;
+    background-color: #383d41;
 }
 
 .note-detail-markdown table th, .note-detail-markdown table td {
-    border: 1px solid #c0c4c8;
+    border: 1px solid #575e65;
     padding: 6px 13px;
 }
 

diff --git a/Simplenote/Simplenote-Info-Hockey.plist b/Simplenote/Simplenote-Info-Hockey.plist
@@ -21,11 +21,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.2</string>
+	<string>1.3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1320</string>
+	<string>1330</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Simplenote/Simplenote-Info.plist b/Simplenote/Simplenote-Info.plist
@@ -21,11 +21,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.2</string>
+	<string>1.3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1320</string>
+	<string>1330</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/Simplenote/TagListViewController.m b/Simplenote/TagListViewController.m
@@ -232,6 +232,11 @@ - (Tag *)addTagWithName:(NSString *)tagName atIndex:(NSNumber *)index
         return nil;
     }
 
+    // Don't add the tag if there is an existing tag with the same name
+    if ([self tagWithName:tagName]) {
+        return nil;
+    }
+
     SimplenoteAppDelegate *appDelegate = [SimplenoteAppDelegate sharedDelegate];
     SPBucket *tagBucket = [appDelegate.simperium bucketForName:@"Tag"];
     NSString *tagKey = [[tagName lowercaseString] sp_urlEncodeString];