Peters Git server - pub/Android/ownCloud.git/history - src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java

projects / pub / Android / ownCloud.git / history

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / ConflictsResolveDialog.java

2015-10-29	David A. Velasco	Merge pull request #1105 from owncloud/fixLegacyTravis	blob \| commitdiff
2015-10-15	masensio	Merge branch 'detailThumbnail' of git://github.com...	blob \| commitdiff
2015-10-01	masensio	Merge pull request #839 from fluffy88/develop	blob \| commitdiff
2015-09-02	masensio	Merge branch 'text_file_preview_pr_707_with_develop...	blob \| commitdiff
2015-09-02	masensio	Merge remote-tracking branch 'origin/master' into text_...	blob \| commitdiff
2015-09-01	David A. Velasco	Merge branch 'master' into copy	blob \| commitdiff
2015-08-25	masensio	Merge branch 'master' into create_folder_button_on_acti...	blob \| commitdiff
2015-08-21	gstraube	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff
2015-08-21	tobiasKaminsky	Merge branch 'develop' of github.com:owncloud/android...	blob \| commitdiff
2015-08-21	purigarcia	Merge branch 'develop' into ignoreHiddenFiles	blob \| commitdiff
2015-08-20	masensio	Merge pull request #1076 from owncloud/material_toolbar	blob \| commitdiff
2015-08-18	Andy Scherzinger	Merge branch 'material_buttons' of https://github.com...	blob \| commitdiff
2015-08-18	Andy Scherzinger	Merge branch 'material_toolbar' of https://github.com...	blob \| commitdiff
2015-08-18	Andy Scherzinger	Conflict Dialog Fix	blob \| commitdiff
2015-08-17	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-08-14	Andy Scherzinger	merged part of the fixes from material buttons branch...	blob \| commitdiff \| diff to current
2015-08-14	Andy Scherzinger	Move to AppCompat AlertDialog for proper rendering...	blob \| commitdiff \| diff to current
2015-08-10	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-08-10	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-08-07	Andy Scherzinger	Merge branch 'master' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-08-07	David A. Velasco	Merge branch 'develop'	blob \| commitdiff \| diff to current
2015-08-06	Andy Scherzinger	Merge branch 'develop' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-08-05	masensio	Merge commit 'refs/pr/707' into text_file_preview_pr_70...	blob \| commitdiff \| diff to current
2015-08-05	masensio	Merge pull request #1068 from owncloud/conflictDialog_n...	blob \| commitdiff \| diff to current
2015-08-04	Andy Scherzinger	Merge branch 'develop' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-08-04	tobiasKaminsky	download file if "use server version"	blob \| commitdiff \| diff to current
2015-08-04	tobiasKaminsky	renamed string values	blob \| commitdiff \| diff to current
2015-08-04	Andy Scherzinger	Merge branch 'develop' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-08-03	Andy Scherzinger	Merge branch 'develop' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-07-26	AndyScherzinger	Merge branch 'develop' of https://github.com/owncloud...	blob \| commitdiff \| diff to current
2015-07-25	AndyScherzinger	initial material design changes for the action bar	blob \| commitdiff \| diff to current
2015-07-06	masensio	Merge branch 'release-1.7.2'	blob \| commitdiff \| diff to current
2015-06-22	David A. Velasco	Merge branch 'master' into develop	blob \| commitdiff \| diff to current
2015-06-15	masensio	Merge branch 'develop' into forbidden_characters_from_s...	blob \| commitdiff \| diff to current
2015-06-15	masensio	Merge pull request #995 from owncloud/navigationDrawer_...	blob \| commitdiff \| diff to current
2015-06-15	masensio	Merge remote-tracking branch 'origin/develop' into...	blob \| commitdiff \| diff to current
2015-06-15	David A. Velasco	Merge branch 'develop' into navigationDrawer_basic	blob \| commitdiff \| diff to current
2015-05-27	tobiasKaminsky	Merge branch 'navigationDrawer_update' of github.com...	blob \| commitdiff \| diff to current
2015-05-27	masensio	Merge branch 'remove_ActionBarSherlock' into navigation...	blob \| commitdiff \| diff to current
2015-05-27	masensio	Merge branch 'develop' into remove_ActionBarSherlock	blob \| commitdiff \| diff to current
2015-05-25	masensio	Add actionBar	blob \| commitdiff \| diff to current
2015-05-21	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff \| diff to current
2015-05-21	masensio	Merge branch 'develop' into navigation_drawer	blob \| commitdiff \| diff to current
2015-05-18	masensio	Merge branch 'develop' into navigation_drawer	blob \| commitdiff \| diff to current
2015-05-18	masensio	Remove actionbarsherlock , replace it with Android...	blob \| commitdiff \| diff to current
2015-04-28	David A. Velasco	Merge branch 'develop' into pinEnhancement	blob \| commitdiff \| diff to current
2015-04-07	masensio	Merge branch 'release-1.7.1' oc-android-1.7.1_signed	blob \| commitdiff \| diff to current
2015-03-16	masensio	Merge branch 'develop' into create_folder_during_upload...	blob \| commitdiff \| diff to current
2015-03-10	masensio	Merge branch 'develop' into accessibility	blob \| commitdiff \| diff to current
2015-03-09	David A. Velasco	Merge branch 'develop' into update_propfind_for_server_8.1	blob \| commitdiff \| diff to current
2015-03-06	masensio	Merge branch 'develop' into share_password_support	blob \| commitdiff \| diff to current
2015-03-06	David A. Velasco	Merge pull request #912 from owncloud/review_license	blob \| commitdiff \| diff to current
2015-03-05	masensio	Update year in license	blob \| commitdiff \| diff to current
2015-03-05	masensio	Add author's line in license	blob \| commitdiff \| diff to current
2014-10-24	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into	blob \| commitdiff \| diff to current
2014-10-24	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff \| diff to current
2014-10-22	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff \| diff to current
2014-04-08	masensio	Merge branch 'develop' into videoInstandUploads	blob \| commitdiff \| diff to current
2014-02-14	masensio	Merge pull request #311 from tobiasKaminsky/develop	blob \| commitdiff \| diff to current
2014-02-14	masensio	Merge branch 'pr/311' into pull_request_311_with_develop	blob \| commitdiff \| diff to current
2014-01-16	David A. Velasco	Merge pull request #330 from LukeOwncloud/update_jackrabbit	blob \| commitdiff \| diff to current
2013-12-16	masensio	Merge branch 'develop' into refactor_remote_operation_t...	blob \| commitdiff \| diff to current
2013-12-16	masensio	Merge branch 'develop' into refactor_remote_operation_t...	blob \| commitdiff \| diff to current
2013-12-13	David A. Velasco	Merge branch 'develop' into refactor_remote_operation_t...	blob \| commitdiff \| diff to current
2013-12-12	David A. Velasco	Added seasonal icon for winter holidays	blob \| commitdiff \| diff to current
2013-12-12	David A. Velasco	Merge branch 'master' into develop	blob \| commitdiff \| diff to current
2013-12-11	David A. Velasco	Merge remote-tracking branch 'origin/release-1.5.2...	blob \| commitdiff \| diff to current
2013-12-10	masensio	Merge pull request #324 from owncloud/last_minute_relea...	blob \| commitdiff \| diff to current
2013-12-10	David A. Velasco	Added seasonal icon for winter holidays	blob \| commitdiff \| diff to current
2013-11-12	David A. Velasco	Merge branch 'develop' into refactor_remote_operation_t...	blob \| commitdiff \| diff to current
2013-11-06	David A. Velasco	Merge pull request #294 from owncloud/setup_buttons	blob \| commitdiff \| diff to current
2013-11-06	David A. Velasco	Merge branch 'develop' into setup_buttons	blob \| commitdiff \| diff to current
2013-11-06	David A. Velasco	Merge branch 'develop' into setup_buttons	blob \| commitdiff \| diff to current
2013-10-29	masensio	Merge branch 'develop' into setup_buttons	blob \| commitdiff \| diff to current
2013-10-29	masensio	Update packageName	blob \| commitdiff \| diff to current
2013-10-24	masensio	Update package name	blob \| commitdiff
2013-06-19	David A. Velasco	Merge branch 'develop'after SPRINT-002	blob \| commitdiff \| diff to current
2013-06-06	masensio	Update branch with develop branch	blob \| commitdiff \| diff to current
2013-05-03	David A. Velasco	Merge branch 'develop' into fixForCrashedSharedContents	blob \| commitdiff \| diff to current
2013-04-25	David A. Velasco	Merge branch 'develop' into oauth_login	blob \| commitdiff \| diff to current
2013-04-17	David A. Velasco	Copyright note fixes	blob \| commitdiff \| diff to current
2013-04-04	David A. Velasco	Merge branch 'develop' into feature_previews	blob \| commitdiff \| diff to current
2013-03-18	David A. Velasco	Merge tag 'oc-android-1-3-22' into oauth_login	blob \| commitdiff \| diff to current
2013-03-14	David A. Velasco	Merge pull request #90 from espenaf/master	blob \| commitdiff \| diff to current
2013-02-08	David A. Velasco	Replaced GPL v3 with GPL v2; PLEASE, note that GPL...	blob \| commitdiff \| diff to current
2013-02-07	David A. Velasco	Updated copyright in source files	blob \| commitdiff \| diff to current
2012-12-18	David A. Velasco	Merge master into oauth_login	blob \| commitdiff \| diff to current
2012-11-26	David A. Velasco	Merge pull request #7 from Mic92/master	blob \| commitdiff \| diff to current
2012-11-23	David A. Velasco	Merge of master after sync_review was merged into it	blob \| commitdiff \| diff to current
2012-11-21	David A. Velasco	Fix conflict dialog to finish the container activity...	blob \| commitdiff \| diff to current
2012-10-27	Bartek Przybylski	add licence header to files	blob \| commitdiff \| diff to current
2012-10-27	Bartek Przybylski	Solving modified date and length conflicts	blob \| commitdiff \| diff to current

ownCloud Android App

RSS Atom