Merge Dev with Master include feature/cloud changes #1
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
* gitignore dropbox credentials * add base Dropbox class * add empty files for directory structure
… tagging files and retrieving tags from files using the tool bar and the tree view. Can execute commands in shell, and detect operation system.
* add gradle build tool * add dropbox dependency * add json dependency * update paths * change java source file (now properly set) * update .gitignore * update source directories (organized by mini modules)
* Add Dropbox Controller * Add Dropbox tests * Add Dropbox menu item
# Conflicts: # src/main/java/directory/FolderViewManager.java # src/main/java/launcher/Controller.java
Sign in
to join this conversation on GitHub.
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.
No description provided.