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

2014-03-13	Thomas Müller	Merge branch 'develop' into introduce-travis-ci	blob \| commitdiff
2014-02-14	masensio	Merge pull request #311 from tobiasKaminsky/develop	blob \| commitdiff
2014-02-14	masensio	Merge branch 'pr/311' into pull_request_311_with_develop	blob \| commitdiff
2014-02-13	David A. Velasco	Merge pull request #367 from LukeOwncloud/renamed_oc_fr...	blob \| commitdiff
2014-02-07	masensio	Merge pull request #390 from owncloud/share_link__new_share	blob \| commitdiff
2014-02-07	masensio	Merge remote-tracking branch 'origin/develop' into...	blob \| commitdiff
2014-02-06	David A. Velasco	Merge branch 'develop' into share_link__new_share	blob \| commitdiff
2014-02-06	David A. Velasco	Merge branch 'share_link__new_share' into setup_additions	blob \| commitdiff
2014-02-05	masensio	Merge branch 'share_link__new_share' into share_link__u...	blob \| commitdiff
2014-02-05	masensio	Merge branch 'develop' into share_link__new_share	blob \| commitdiff
2014-02-04	David A. Velasco	Merge branch 'develop' into share_link__new_share	blob \| commitdiff
2014-02-04	David A. Velasco	Connected selection of app to send share link with...	blob \| commitdiff
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
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-12-05	David A. Velasco	Merge remote-tracking branch 'origin/sync_review_2'	blob \| commitdiff \| diff to current
2012-11-27	David A. Velasco	Some cleanup	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-20	David A. Velasco	Fixed 'keep both' action in conflicts dialog (both...	blob \| commitdiff \| diff to current
2012-11-20	David A. Velasco	ConlictsResolveActivity is finished when the user cance...	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