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

projects / pub / Android / ownCloud.git / history

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / ConflictsResolveActivity.java

2015-07-06	masensio	Merge branch 'release-1.7.2'	blob \| commitdiff
2015-06-22	David A. Velasco	Merge branch 'master' into develop	blob \| commitdiff
2015-06-15	masensio	Merge branch 'develop' into forbidden_characters_from_s...	blob \| commitdiff
2015-06-15	masensio	Merge pull request #995 from owncloud/navigationDrawer_...	blob \| commitdiff
2015-06-15	masensio	Merge remote-tracking branch 'origin/develop' into...	blob \| commitdiff
2015-06-15	David A. Velasco	Merge branch 'develop' into navigationDrawer_basic	blob \| commitdiff
2015-05-27	tobiasKaminsky	Merge branch 'navigationDrawer_update' of github.com...	blob \| commitdiff
2015-05-27	masensio	Merge branch 'remove_ActionBarSherlock' into navigation...	blob \| commitdiff
2015-05-27	masensio	Merge branch 'develop' into remove_ActionBarSherlock	blob \| commitdiff
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
2015-05-18	masensio	Merge branch 'develop' into navigation_drawer	blob \| commitdiff
2015-05-18	masensio	Remove actionbarsherlock , replace it with Android...	blob \| commitdiff
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-11-05	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff \| diff to current
2014-10-29	grecep	Merge pull request #669 from grecep/master	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-24	jabarros	Merge branch 'thumbnails_from_server' of https://github...	blob \| commitdiff \| diff to current
2014-10-23	jabarros	Merge branch 'sortingFiles' of https://github.com/tobia...	blob \| commitdiff \| diff to current
2014-10-22	tobiasKaminsky	Merge remote-tracking branch 'upstream/develop' into...	blob \| commitdiff \| diff to current
2014-10-17	MMMarcy	Merge remote-tracking branch 'theirs/develop' into...	blob \| commitdiff \| diff to current
2014-10-17	Magnus Sjoqvist	Merge with develop	blob \| commitdiff \| diff to current
2014-10-15	jabarros	Merge branch 'idn_hosts' of https://github.com/ogasser...	blob \| commitdiff \| diff to current
2014-10-09	jabarros	Merge branch 'sortingFiles' of https://github.com/tobia...	blob \| commitdiff \| diff to current
2014-10-06	jabarros	Merge branch 'master' of https://github.com/loripino21...	blob \| commitdiff \| diff to current
2014-10-01	Javier Gonzalez	Merge pull request #641 from owncloud/thumbnails_for_do...	blob \| commitdiff \| diff to current
2014-09-18	David A. Velasco	Merge branch 'develop' into release-1.6.0	blob \| commitdiff \| diff to current
2014-09-18	David A. Velasco	Merge pull request #627 from owncloud/better_loggin_system	blob \| commitdiff \| diff to current
2014-09-18	David A. Velasco	Fixed conflict - Merge branch 'develop' into better_log...	blob \| commitdiff \| diff to current
2014-09-17	jabarros	Merge branch 'develop' into better_loggin_system	blob \| commitdiff \| diff to current
2014-09-11	jabarros	Move Logger class to owncloud library and update refere...	blob \| commitdiff \| diff to current
2014-04-08	masensio	Merge branch 'develop' into videoInstandUploads	blob \| commitdiff \| diff to current
2014-03-13	Thomas Müller	Merge branch 'develop' into introduce-travis-ci	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-02-13	David A. Velasco	Merge pull request #367 from LukeOwncloud/renamed_oc_fr...	blob \| commitdiff \| diff to current
2014-02-07	masensio	Merge pull request #390 from owncloud/share_link__new_share	blob \| commitdiff \| diff to current
2014-02-07	masensio	Merge remote-tracking branch 'origin/develop' into...	blob \| commitdiff \| diff to current
2014-02-06	David A. Velasco	Merge branch 'develop' into share_link__new_share	blob \| commitdiff \| diff to current
2014-02-06	David A. Velasco	Merge branch 'share_link__new_share' into setup_additions	blob \| commitdiff \| diff to current
2014-02-05	masensio	Merge branch 'share_link__new_share' into share_link__u...	blob \| commitdiff \| diff to current
2014-02-05	masensio	Merge branch 'develop' into share_link__new_share	blob \| commitdiff \| diff to current
2014-02-04	David A. Velasco	Merge branch 'develop' into share_link__new_share	blob \| commitdiff \| diff to current
2014-02-04	David A. Velasco	Connected selection of app to send share link with...	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-12-04	David A. Velasco	Merge branch 'master' into develop	blob \| commitdiff \| diff to current
2013-11-19	David A. Velasco	Merge pull request #304 from owncloud/refactor_remote_o...	blob \| commitdiff \| diff to current
2013-11-18	David A. Velasco	Merge branch 'develop' into refactor_remote_operation_t...	blob \| commitdiff \| diff to current
2013-11-13	masensio	Merge remote-tracking branch 'origin/refactor_remote_op...	blob \| commitdiff \| diff to current
2013-11-13	David A. Velasco	Moved some classes from root package to .utils	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	Update packageName	blob \| commitdiff \| diff to current
2013-10-28	David A. Velasco	Merge branch 'develop' into clean_up	blob \| commitdiff \| diff to current
2013-10-24	masensio	Update package name	blob \| commitdiff
2013-10-24	masensio	Merge pull request #269 from owncloud/refresh_folder_co...	blob \| commitdiff \| diff to current
2013-10-24	David A. Velasco	Merge branch 'develop' into refresh_folder_contents_whe...	blob \| commitdiff \| diff to current
2013-10-23	David A. Velasco	Merge branch 'develop' into refresh_folder_contents_whe...	blob \| commitdiff \| diff to current
2013-10-22	David A. Velasco	Merge branch 'develop' into refresh_folder_contents_whe...	blob \| commitdiff \| diff to current
2013-10-18	David A. Velasco	Merge branch 'develop' into refresh_folder_contents_whe...	blob \| commitdiff \| diff to current
2013-10-14	David A. Velasco	Merge remote-tracking branch 'origin/refresh_folder_con...	blob \| commitdiff \| diff to current
2013-10-14	David A. Velasco	Removed interface DataStorageManager	blob \| commitdiff \| diff to current
2013-07-16	masensio	Merge branch 'master' into release-1.4.2	blob \| commitdiff \| diff to current
2013-07-10	David A. Velasco	Merge branch 'master' into develop	blob \| commitdiff \| diff to current
2013-07-09	David A. Velasco	Merge remote-tracking branch 'origin/bug_folder_size_de...	blob \| commitdiff \| diff to current
2013-07-05	David A. Velasco	Merge branch 'develop' into branding_configurable_URL_i...	blob \| commitdiff \| diff to current
2013-07-05	David A. Velasco	Merge branch 'master' into develop	blob \| commitdiff \| diff to current
2013-07-03	masensio	Merge pull request #204 from owncloud/check_account_exi...	blob \| commitdiff \| diff to current
2013-07-03	David A. Velasco	Merge branch 'develop' into check_account_existance_in_...	blob \| commitdiff \| diff to current
2013-06-28	David A. Velasco	Merge branch 'develop' into check_account_existance_in_...	blob \| commitdiff \| diff to current
2013-06-19	David A. Velasco	Merge branch 'develop'after SPRINT-002	blob \| commitdiff \| diff to current
2013-06-17	David A. Velasco	ConflictsResolveActivity protected against access to...	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-15	David A. Velasco	Merge pull request #118 from owncloud/loggingtool	blob \| commitdiff \| diff to current
2013-04-15	David A. Velasco	Used Log_OC in all the logs	blob \| commitdiff \| diff to current
2013-04-15	David A. Velasco	Merge branch 'develop' into loggingtool	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-03-12	zerginator	This wraps the android.util.logging into Log_OC which...	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
next

ownCloud Android App

RSS Atom