projects
/
pub
/
Android
/
ownCloud.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
fix merge errors
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
ui
/
fragment
/
2015-11-13
tobiasKaminsky
Merge branch 'beta' of github.com:owncloud/android...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/target_m...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/cancelUp...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/material...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/switchLi...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/descendI...
tree
|
commitdiff
2015-11-13
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-11-12
David A. Velasco
Merge pull request #1254 from owncloud/droid-update
tree
|
commitdiff
2015-11-10
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
2015-11-10
Andy Scherzinger
Merge branch '1193_uploader_layout' of https://github...
tree
|
commitdiff
2015-11-09
Andy Scherzinger
Merge branch 'beta' of https://github.com/owncloud...
tree
|
commitdiff
2015-11-06
tobiasKaminsky
do not show "switch" menu item on file details/preview...
tree
|
commitdiff
2015-11-06
tobiasKaminsky
Merge branch 'setAsWallpaper' into beta
tree
|
commitdiff
2015-11-06
tobiasKaminsky
fixed sharing
tree
|
commitdiff
2015-11-06
Andy Scherzinger
Merge branch 'material_fab' of https://github.com/owncl...
tree
|
commitdiff
2015-11-06
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
tree
|
commitdiff
2015-11-06
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
2015-11-06
Maria Asensio
Merge pull request #1184 from Wikinaut/show-certificate...
tree
|
commitdiff
2015-11-05
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizedI...
tree
|
commitdiff
2015-11-05
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-11-05
Maria Asensio
Merge pull request #1252 from owncloud/share_with_users
tree
|
commitdiff
2015-11-04
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
tree
|
commitdiff
2015-11-04
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
tree
|
commitdiff
2015-11-04
Andy Scherzinger
Merge branch 'beta' of https://github.com/owncloud...
tree
|
commitdiff
2015-11-04
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
tree
|
commitdiff
2015-11-04
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
tree
|
commitdiff
2015-11-02
tobiasKaminsky
update
tree
|
commitdiff
2015-11-02
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
tree
|
commitdiff
2015-11-02
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
tree
|
commitdiff
2015-11-02
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
tree
|
commitdiff
2015-11-02
Andy Scherzinger
Merge branch 'material_buttons' of https://github.com...
tree
|
commitdiff
2015-11-02
tobiasKaminsky
Merge branch 'setAsWallpaper' into beta
tree
|
commitdiff
2015-11-02
tobiasKaminsky
Merge branch 'setAsWallpaper' into beta
tree
|
commitdiff
2015-11-02
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
2015-11-01
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/streamin...
tree
|
commitdiff
2015-11-01
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/video_th...
tree
|
commitdiff
2015-11-01
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/streamin...
tree
|
commitdiff
2015-11-01
tobiasKaminsky
tidy up once more
tree
|
commitdiff
2015-11-01
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-11-01
tobiasKaminsky
tidy up
tree
|
commitdiff
2015-10-31
tobiasKaminsky
removed NPE
tree
|
commitdiff
2015-10-31
tobiasKaminsky
implements #1233
tree
|
commitdiff
2015-10-31
tobiasKaminsky
fix #1230
tree
|
commitdiff
2015-10-31
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-10-31
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-10-31
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizedI...
tree
|
commitdiff
2015-10-31
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizedI...
tree
|
commitdiff
2015-10-30
David A. Velasco
Refactoring: a single method to request ShareActivity
tree
|
commitdiff
2015-10-30
David A. Velasco
Simplified handling of life cycle in ShareActivity...
tree
|
commitdiff
2015-10-30
David A. Velasco
Fixed NPE on list of shares in SearchShareesFragment...
tree
|
commitdiff
2015-10-30
David A. Velasco
Renamed SearchFragment to SearchShareesFragment
tree
|
commitdiff
2015-10-30
masensio
Avoid fullscreen searchview when editing
tree
|
commitdiff
2015-10-30
David A. Velasco
Put focus in search field and show keyboard automatically
tree
|
commitdiff
2015-10-30
masensio
Good behaviiour in servers not supporting SHAREE API...
tree
|
commitdiff
2015-10-30
masensio
Show users/groups in Search Fragment list
tree
|
commitdiff
2015-10-30
David A. Velasco
Fixed build after rebasing
tree
|
commitdiff
2015-10-30
masensio
Extra commit to complement: Fill in Users/Groups List...
tree
|
commitdiff
2015-10-30
masensio
Get users/group from Server, to fill in 'Share with...
tree
|
commitdiff
2015-10-30
masensio
Remove share_group_indicator string
tree
|
commitdiff
2015-10-30
David A. Velasco
Prevent that arbitrary text is queried instead of selec...
tree
|
commitdiff
2015-10-30
masensio
Use UnshareOperation instead an AsyncTask, for unshare...
tree
|
commitdiff
2015-10-30
masensio
Change ShareActivity type, now it is a FileActivity
tree
|
commitdiff
2015-10-30
David A. Velasco
Removed redundant ArrayList creation
tree
|
commitdiff
2015-10-30
tobiasKaminsky
fixed travis bug
tree
|
commitdiff
2015-10-30
masensio
Add unshare with users/groups, from Share wiht view
tree
|
commitdiff
2015-10-30
masensio
Clean code in ShareFileFragment
tree
|
commitdiff
2015-10-30
masensio
Animate unshare button
tree
|
commitdiff
2015-10-30
masensio
Add unshare with user option to share with view
tree
|
commitdiff
2015-10-30
David A. Velasco
Complete search widget to send search requests to paren...
tree
|
commitdiff
2015-10-30
masensio
Get shares from Database (WIP)
tree
|
commitdiff
2015-10-30
masensio
Show users/groups in share with view, getting the data...
tree
|
commitdiff
2015-10-30
masensio
Remove android.support.widget components from the share...
tree
|
commitdiff
2015-10-30
masensio
Show the 'search' layout in phone and tablet
tree
|
commitdiff
2015-10-30
masensio
Show the layout to hsare with user in phone and tablet
tree
|
commitdiff
2015-10-30
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
2015-10-30
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
2015-10-30
Maria Asensio
Merge pull request #1109 from owncloud/sync_full_folder
tree
|
commitdiff
2015-10-30
tobiasKaminsky
fixed #1230
tree
|
commitdiff
2015-10-29
David A. Velasco
Merge pull request #1105 from owncloud/fixLegacyTravis
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/multiSel...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/avoidDup...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/sortInUp...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/videoBig...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizeCa...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/switchOf...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/material...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/material...
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge branch 'switchListVsGridMaster' into beta
tree
|
commitdiff
2015-10-29
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-10-29
Andy Scherzinger
Merge branch 'descendIntoFolder' of https://github...
tree
|
commitdiff
2015-10-29
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
2015-10-27
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/animated...
tree
|
commitdiff
2015-10-27
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/master...
tree
|
commitdiff
2015-10-27
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
2015-10-27
Andy Scherzinger
hide FAB in copy/move folder chooser
tree
|
commitdiff
2015-10-27
masensio
Merge branch 'master' into sync_full_folder
tree
|
commitdiff
2015-10-26
tobiasKaminsky
Merge remote-tracking branch 'remotes/upstream/resizedI...
tree
|
commitdiff
2015-10-26
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
2015-10-26
Andy Scherzinger
Merge branch 'master' of https://github.com/owncloud...
tree
|
commitdiff
next