projects / pub / Android / ownCloud.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Use SYNC_CONFLICT instead CONFLICT for conflicts in UploadFileOperation
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog /
2015-09-30 masensioMerge branch 'master' into sync_full_folder tree | commitdiff
2015-09-25 David A. VelascoETag used to detect changes in remote files (not only... tree | commitdiff
2015-09-16 masensioMerge pull request #1149 from owncloud/new_filetype_icons tree | commitdiff
2015-09-14 masensioMerge branch 'update_share_link_for_OC_8.2' of github... tree | commitdiff
2015-09-11 David A. VelascoMerge pull request #1141 from owncloud/559_longpress_fi... tree | commitdiff
2015-09-07 Andy Scherzingershowing the filename in the long press menu on file... tree | commitdiff
2015-09-02 masensioMerge branch 'text_file_preview_pr_707_with_develop... tree | commitdiff
2015-09-02 masensioMerge remote-tracking branch 'origin/master' into text_... tree | commitdiff
2015-09-01 David A. VelascoMerge branch 'master' into copy tree | commitdiff
2015-08-25 masensioMerge branch 'master' into create_folder_button_on_acti... tree | commitdiff
2015-08-21 gstraubeMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2015-08-21 tobiasKaminskyMerge branch 'develop' of github.com:owncloud/android... tree | commitdiff
2015-08-21 purigarciaMerge branch 'develop' into ignoreHiddenFiles tree | commitdiff
2015-08-20 masensioMerge pull request #1076 from owncloud/material_toolbar tree | commitdiff
2015-08-20 Andy Scherzingerfurther m-prefixing tree | commitdiff
2015-08-20 Andy Scherzingerfixed m-Prefixing tree | commitdiff
2015-08-20 Andy Scherzingerprefixed variables with 'm' tree | commitdiff
2015-08-19 Andy ScherzingerNPE Fix for setting the color on the IndeterminateProgr... tree | commitdiff
2015-08-18 Andy ScherzingerFix for long click menue for account management in... tree | commitdiff
2015-08-18 Andy Scherzingerfix for the progress bar on pre lollipop devices via... tree | commitdiff
2015-08-18 Andy Scherzingerreverted back to light colored login tree | commitdiff
2015-08-18 Andy ScherzingerConflict Dialog Fix tree | commitdiff
2015-08-18 Andy Scherzingervisual fix for Progress DialogFragment(s) tree | commitdiff
2015-08-17 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud... tree | commitdiff
2015-08-17 Andy ScherzingerFix for 4.0 file action context menu (re-implement... tree | commitdiff
2015-08-14 Andy Scherzingermerged part of the fixes from material buttons branch... tree | commitdiff
2015-08-13 Andy ScherzingerFix for ssl popups padding, button style changed to... tree | commitdiff
2015-08-10 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud... tree | commitdiff
2015-08-07 David A. VelascoMerge branch 'develop' tree | commitdiff
2015-08-06 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud... tree | commitdiff
2015-08-06 Andy ScherzingerBugfix für Lollipop AlertDialog Bug (see styles), moved... tree | commitdiff
2015-08-06 Andy ScherzingerMove alert dialog to material variant and setting the... tree | commitdiff
2015-08-05 masensioMerge commit 'refs/pr/707' into text_file_preview_pr_70... tree | commitdiff
2015-08-05 masensioMerge pull request #1068 from owncloud/conflictDialog_n... tree | commitdiff
2015-08-04 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud... tree | commitdiff
2015-08-04 tobiasKaminskydownload file if "use server version" tree | commitdiff
2015-08-04 tobiasKaminskyrenamed string values tree | commitdiff
2015-08-04 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud... tree | commitdiff
2015-08-03 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud... tree | commitdiff
2015-07-28 purigarciamerge develop tree | commitdiff
2015-07-26 AndyScherzingerMerge branch 'develop' of https://github.com/owncloud... tree | commitdiff
2015-07-26 AndyScherzingerMerge branch 'master' of https://github.com/owncloud... tree | commitdiff
2015-07-25 AndyScherzingerinitial material design changes for the action bar tree | commitdiff
2015-07-23 David A. VelascoMerge pull request #1050 from owncloud/favourites_conte... tree | commitdiff
2015-07-22 purigarciachange the name of the method from keepInSync to favori... tree | commitdiff
2015-07-06 masensioMerge branch 'release-1.7.2' tree | commitdiff
2015-06-22 David A. VelascoMerge branch 'master' into develop tree | commitdiff
2015-06-17 David A. VelascoMerge pull request #1014 from owncloud/forbidden_charac... tree | commitdiff
2015-06-15 masensioMerge branch 'develop' into forbidden_characters_from_s... tree | commitdiff
2015-06-15 masensioMerge pull request #995 from owncloud/navigationDrawer_... tree | commitdiff
2015-06-15 masensioMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2015-06-15 David A. VelascoMerge branch 'develop' into navigationDrawer_basic tree | commitdiff
2015-06-04 masensioFix, the message is not correct when creating a folder... tree | commitdiff
2015-06-02 masensioFilter only '/' character in user input when version... tree | commitdiff
2015-05-27 tobiasKaminskyMerge branch 'navigationDrawer_update' of github.com... tree | commitdiff
2015-05-27 tobiasKaminskyMerge branch 'navigationDrawer_update' of github.com... tree | commitdiff
2015-05-27 masensioMerge branch 'remove_ActionBarSherlock' into navigation... tree | commitdiff
2015-05-27 masensioMerge branch 'develop' into remove_ActionBarSherlock tree | commitdiff
2015-05-25 masensioDisable On Device option in Navigation Drawer tree | commitdiff
2015-05-25 masensioAdd actionBar tree | commitdiff
2015-05-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2015-05-21 masensioMerge branch 'develop' into navigation_drawer tree | commitdiff
2015-05-18 masensioMerge branch 'develop' into navigation_drawer tree | commitdiff
2015-05-18 masensioRemove actionbarsherlock , replace it with Android... tree | commitdiff
2015-05-05 masensioMerge branch 'develop' into thumbnailOOM tree | commitdiff
2015-05-04 purigarciaMerge branch 'develop' into automationTest tree | commitdiff
2015-04-28 David A. VelascoMerge branch 'develop' into pinEnhancement tree | commitdiff
2015-04-22 David A. VelascoMerge pull request #957 from owncloud/fix_crash_invalid... tree | commitdiff
2015-04-22 David A. VelascoMerge branch 'develop' into loging_different_servers_sa... tree | commitdiff
2015-04-20 masensioMerge pull request #956 from owncloud/fix_app_closes_ne... tree | commitdiff
2015-04-17 David A. VelascoGot rid of other old dialogs in FileDisplayActivity tree | commitdiff
2015-04-17 David A. VelascoFixed bug: depecrated showdialog should not be used... tree | commitdiff
2015-04-07 masensioMerge branch 'release-1.7.1' oc-android-1.7.1_signed tree | commitdiff
2015-03-25 purigarciaMerge branch 'develop' into automationTest tree | commitdiff
2015-03-25 David A. VelascoMerge pull request #924 from owncloud/add_user_agent_su... tree | commitdiff
2015-03-19 David A. VelascoMerge pull request #914 from owncloud/accessibility tree | commitdiff
2015-03-18 masensioAdd user-agent string to setup options tree | commitdiff
2015-03-16 masensioMerge branch 'develop' into create_folder_during_upload... tree | commitdiff
2015-03-10 masensioMerge branch 'develop' into accessibility tree | commitdiff
2015-03-10 David A. VelascoMerge pull request #918 from owncloud/share_password_su... tree | commitdiff
2015-03-10 masensioMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2015-03-10 purigarciaMerge branch 'develop' into share_password_support tree | commitdiff
2015-03-09 David A. VelascoMerge branch 'develop' into update_propfind_for_server_8.1 tree | commitdiff
2015-03-09 masensioFix bug: password is shown, when in fact we do not... tree | commitdiff
2015-03-09 purigarciaMerge branch 'develop' into share_password_support tree | commitdiff
2015-03-06 masensioProcess share with password tree | commitdiff
2015-03-06 masensioMerge branch 'develop' into share_password_support tree | commitdiff
2015-03-06 David A. VelascoMerge pull request #912 from owncloud/review_license tree | commitdiff
2015-03-05 masensioCreate password dialog: SharePasswordDialog.java tree | commitdiff
2015-03-05 masensioUpdate year in license tree | commitdiff
2015-03-05 masensioAdd author's line in license tree | commitdiff
2015-02-19 masensioMerge branch 'develop' into cancel_transfer_for_deleted... tree | commitdiff
2015-02-19 David A. VelascoMerge branch 'master' into develop tree | commitdiff
2015-02-03 David A. VelascoMerge branch 'master' into release-1.7.0 tree | commitdiff
2015-01-30 masensioMerge pull request #869 from owncloud/hotfix__fixed_sta... oc-android-1.6.3-SAML-not-to-release tree | commitdiff
2015-01-30 David A. VelascoClean-up excess of logs in SAML dialog tree | commitdiff
2015-01-30 David A. VelascoLoad SAML log-in dialog from the original URL so that... tree | commitdiff
2015-01-18 tobiasKaminskyMerge branch 'develop2' into imageGrid2 tree | commitdiff
2015-01-08 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2015-01-05 tobiasKaminskyupdate tree | commitdiff
next
ownCloud Android App