Merge branch 'master' into develop
[pub/Android/ownCloud.git] / src / com / owncloud / android / utils / DisplayUtils.java
2015-02-19 David A. VelascoMerge branch 'master' into develop
2015-02-17 David A. VelascoRecovered ExtendedListView; ExtendedListFragment update...
2015-02-03 David A. VelascoMerge branch 'master' into release-1.7.0
2015-02-03 David A. VelascoMerge pull request #731 from owncloud/imageGrid
2015-02-02 David A. VelascoMerge branch 'develop' into imageGrid
2015-01-20 jabarrosMerge branch 'develop' into imageGrid
2015-01-20 jabarrosMerge branch 'develop' into SettingsGreyedOut
2015-01-19 tobiasKaminskyMerge branches 'develop' and 'imageGrid' of github...
2015-01-19 tobiasKaminskyrebased
2015-01-19 tobiasKaminskyMerge branch 'develop2' into imageGrid2
2015-01-19 David A. VelascoMerge pull request #798 from LukeOwncloud/develop
2015-01-19 jabarrosMerge branch 'develop' into download_folder
2015-01-18 tobiasKaminskyMerge branch 'develop2' into imageGrid2
2015-01-14 David A. VelascoMerge pull request #746 from owncloud/thumbnailForUpload
2015-01-12 jabarrosMerge branch 'develop' into thumbnailForUpload
2015-01-12 jabarrosChanges after CR
2015-01-09 jabarrosFixed. In the upload view, videos does not have the...
2015-01-09 David A. VelascoFixed icon for MIME type application/javascript
2015-01-08 David A. VelascoConsidered MIME types for .py, .js, and fixed .xls...
2015-01-08 David A. VelascoConsider application/xml for XML files
2014-12-31 jabarrosFix. Some icons are not correct. Showed default file...
2014-12-26 jabarrosMerge branch 'develop' into obeySortOrder_fixmerge
2014-12-26 jabarrosMerge pull request #755 from owncloud/OpenWithInContextMenu
2014-12-19 jabarrosMerge branch 'develop' into thumbnailForUpload
2014-12-12 jabarrosMerge pull request #766 from owncloud/feedbackWithVersi...
2014-12-11 jabarrosMerge branch 'develop' into community_image-preview...
2014-12-11 jabarrosMerge branch 'develop' into community_rotateImage
2014-12-10 jabarrosMerge branch 'fix_protocol_send_mail' into fix_logs_cha...
2014-12-10 jabarrosMerge pull request #754 from owncloud/RadioListOnAccounts
2014-12-09 David A. VelascoMerge remote-tracking branch 'rhabbachi/feature/308_syn...
2014-12-05 SamMerge branch 'develop' of https://github.com/owncloud...
2014-12-03 David A. VelascoMerge branch 'master' into develop
2014-12-03 jabarrosMerge pull request #773 from owncloud/triggerMediaScan
2014-12-03 SamMerged with owncloud develop
2014-12-03 David A. VelascoRemoved empty method, and some unused imports
2014-12-03 jabarrosMerge branch 'release-1.6.2' oc-android-1.6.2
2014-11-26 David A. VelascoMerge pull request #752 from owncloud/instant_uploads_s...
2014-11-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-21 tobiasKaminskyMerge branch 'develop' of git@github.com:owncloud/andro...
2014-11-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-21 Jorge Antonio Diaz... Merge remote-tracking branch 'upstream/develop' into...
2014-11-21 David A. VelascoMerge pull request #740 from owncloud/revert-669-master
2014-11-21 jabarrosMerge pull request #722 from ogasser/idn_share_fix
2014-11-20 jabarrosRemove last slash from uploads path (video/image) when...
2014-11-19 jabarrosMerge branch 'develop' into instant_uploads_set_path
2014-11-19 David A. VelascoMerge pull request #721 from owncloud/nea_upload_files
2014-11-19 David A. VelascoMerge branch 'develop' into nea_upload_files
2014-11-18 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-18 jabarrosMerge branch 'develop' into nea_upload_files
2014-11-17 jabarrosMerge branch 'develop' into nea_upload_files
2014-11-17 Jorge Antonio Diaz... Merge remote-tracking branch 'upstream/develop' into...
2014-11-17 jabarrosRefactoring to avoid maintenance after CR
2014-11-13 David A. VelascoMerge pull request #685 from tobiasKaminsky/beautifyTim...
2014-11-13 tobiasKaminsky- reference bug 716
2014-11-12 tobiasKaminskyfix Problem with < Android 3.0
2014-11-12 David A. VelascoMerge pull request #683 from tobiasKaminsky/videoFullsize
2014-11-12 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-12 tobiasKaminsky< 60 seconds -> "seconds ago"
2014-11-11 Magnus Sjoqvistmerge
2014-11-05 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-05 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-05 David A. VelascoMerge pull request #706 from owncloud/christmas_app
2014-11-03 David A. VelascoMerge pull request #687 from owncloud/thumbnails_from_s...
2014-11-03 jabarrosMerge branch 'develop' into christmas_app
2014-11-03 jabarrosUpdate getSeasonalId method on DisplayUtils class for...
2014-10-31 David A. VelascoMerge branch 'remember_last_share_location' into rememb...
2014-10-30 jabarrosMerge pull request #697 from owncloud/fix_https_access_...
2014-10-29 grecepMerge pull request #669 from grecep/master
2014-10-29 jabarrosMerge pull request #686 from tobiasKaminsky/bugfixMulti...
2014-10-28 Jorge Antonio Diaz... Merge branch 'gradleWithInternalDependency' of github...
2014-10-28 David A. VelascoMerge pull request #673 from owncloud/idn_hosts
2014-10-28 jabarrosMerge branch 'develop' into idn_hosts
2014-10-24 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into
2014-10-24 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-23 jabarrosMerge branch 'develop' into idn_hosts
2014-10-22 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-15 jabarrosMerge branch 'idn_hosts' of https://github.com/ogasser...
2014-09-17 Oliver GasserAdd code to handle ownCloud servers running on IDN
2014-05-30 masensioMerge branch 'develop' into pull_down_refresh
2014-05-30 masensioMerge branch 'master' into vanish_notifications
2014-05-30 masensioMerge branch 'master' into develop
2014-05-27 masensioAdd comments
2014-05-27 masensioRemove unnecessary import in DisplayUtils
2014-05-27 masensioMerge branch 'fixed_video_playback_on_rotations' into...
2014-05-27 masensioMerge branch 'develop' into release-1.5.6
2014-05-27 masensioUpdate file images, add new mimetypes to show: spreadsh...
2014-04-08 masensioMerge branch 'develop' into videoInstandUploads
2014-02-14 masensioMerge pull request #311 from tobiasKaminsky/develop
2014-02-14 masensioMerge branch 'pr/311' into pull_request_311_with_develop
2014-01-16 David A. VelascoMerge pull request #330 from LukeOwncloud/update_jackrabbit
2013-12-16 masensioMerge branch 'develop' into refactor_remote_operation_t...
2013-12-16 masensioMerge branch 'develop' into refactor_remote_operation_t...
2013-12-13 David A. VelascoMerge branch 'develop' into refactor_remote_operation_t...
2013-12-12 David A. VelascoAdded seasonal icon for winter holidays
2013-12-12 David A. VelascoMerge branch 'master' into develop
2013-12-11 David A. VelascoMerge remote-tracking branch 'origin/release-1.5.2...
2013-12-10 masensioMerge pull request #324 from owncloud/last_minute_relea...
2013-12-10 David A. VelascoAdded seasonal icon for winter holidays
2013-12-04 David A. VelascoMerge branch 'master' into develop
next