Squash from #41, Solved conflicts on notification codes; #58
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Lucashuang0802
changed the title
|
@Lucashuang0802 Sorry, took me a while to get back to you. |
|
Sure, I will take some time to rebase it and fix it tonight. |
|
@Lucashuang0802 Awesome, thank you! Everything else looks great! |
|
Okay, I will comment it once I am done with it. |
added 2 commits
May 27, 2015 21:14
Conflicts: en/ios/handling-errors.mdown en/ios/in-app-purchases.mdown en/ios/local-datastore.mdown en/ios/push-notifications.mdown en/ios/queries.mdown en/ios/user-interface.mdown
|
Finished the type fixes and rebase. Code can be merged to the master branch right now. Deleted some help-wanting indicator from Swift docs. |
|
Perfect! Ready to merge in! |
added 3 commits
May 28, 2015 09:51
Fixed typo Small grammar and style fixes. Actualization documentation Update of russian version of documentation based on english version. Add Promises section to the JS Guide. Make it clearer that Promises is the way to go with JS. Change incorrect string concatenation character In the very first PHP code example, the string concat character is given as "+" in the code. It should be "." I think this is critical, because most users might copy-paste the first example and might get "0" if there was an exception, instead of the actual message. Fix Links in Performance Guide Also fixes bug when Swift is selected, since there are no Swift examples for these yet. Facebook SDK Integration clarification The Parse SDK does not automatically fetch Facebook data based on the read p this was a typo As evidenced by the same sentence later in the parse website (where I read this document) the line should read "just by" and not "just be". Clarify subclassing instructions and difference between +load and +initialize. Update objects.mdown Fix typo in REST reference section Fix spacing get rid of �� Remove �� Minor grammar corrections in the Facebook user section.
…Docs into swift-ios-update # By Hector Ramos (4) and others # Via Héctor Ramos (9) and others * 'swift-ios-update' of https://github.com/Lucashuang0802/Docs: Minor grammar corrections in the Facebook user section. Fixed typo Remove �� get rid of �� Fix spacing Fix typo in REST reference section Update objects.mdown Add link to open Swift samples issue. this was a typo Clarify subclassing instructions and difference between +load and +initialize. Fix Links in Performance Guide Change incorrect string concatenation character Make it clearer that Promises is the way to go with JS. Add Promises section to the JS Guide. Squash from #41, some notification codes are conflict; Actualization documentation Small grammar and style fixes. Facebook SDK Integration clarification
|
I will just create another pull request and I will delete the previous after merging. That's more easier. |
|
Link #73 |
|
Superseeded by #73 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Link #21 and #41