Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: owncloud/android
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: jt6562/android
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 9 files changed
  • 2 contributors

Commits on Nov 30, 2015

  1. Merge pull request #1 from owncloud/master 

    Update
    @jt6562
    jt6562 committed Nov 30, 2015
    Configuration menu
    Copy the full SHA
    5724692 View commit details
    Browse the repository at this point in the history

  2. Disable share button, and Add file decrypt/encrypt function. 

    Signed-off-by: jitao <jt6562@gmail.com>
    @jt6562
    jt6562 committed Nov 30, 2015
    Configuration menu
    Copy the full SHA
    614654e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/jt6562/android 

    Conflicts:
	res/menu/file_actions_menu.xml
	src/com/owncloud/android/files/FileMenuFilter.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
	src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
	src/com/owncloud/android/ui/preview/PreviewTextFragment.java
    @jt6562
    jt6562 committed Nov 30, 2015
    Configuration menu
    Copy the full SHA
    5db1806 View commit details
    Browse the repository at this point in the history

  4. Modify submodule 'android-library' git repo path 

    Signed-off-by: jitao <jt6562@gmail.com>
    @jt6562
    jt6562 committed Nov 30, 2015
    Configuration menu
    Copy the full SHA
    0ee89bf View commit details
    Browse the repository at this point in the history
Loading