mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity
3884 commits 226 branches 1571 tags 618 MiB
Commit graph

237 commits

Author SHA1 Message Date
David A. Velasco
e6be60679f Merge branch 'master' into copy 
Conflicts FIXED:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/com/owncloud/android/ui/preview/FileDownloadFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
	src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
 2015-09-01 18:35:51 +02:00
Andy Scherzinger
da89715045 reverted back to light colored login 2015-08-18 17:48:10 +02:00
Jorge Antonio Diaz-Benito Soriano
97625170fa Taken out old activity 2015-08-18 17:37:57 +02:00
Jorge Antonio Diaz-Benito Soriano
3b2f51b5a5 Refactored functionality to use the new FolderPickerActivity class 2015-08-18 17:36:08 +02:00
Jorge Antonio Diaz-Benito Soriano
c7205b8f56 Added CopyActivity 2015-08-18 11:39:18 +02:00
Andy Scherzinger
60e0f09278 Fix for ssl popups padding, button style changed to borderless, fixed weight on buttons 2015-08-13 15:41:59 +02:00
Andy Scherzinger
4a4296a07e Material Buttons (draft) 2015-08-07 17:09:47 +02:00
Andy Scherzinger
6b6227125b added back translucent action bar for image preview 2015-08-06 19:04:22 +02:00
AndyScherzinger
d474239b21 initial material design changes for the action bar 2015-07-26 01:49:27 +02:00
masensio
fb7692e058 Update versionName and versionCode in AndroidManifest.xml 2015-06-22 15:47:36 +02:00
masensio
977cf5514d update minSdkVersion (to 14) in AndroidManifest.xml 2015-06-22 13:57:54 +02:00
David A. Velasco
9593b580b7 Replaced 'PIN code' by 'pass code' 2015-05-04 11:41:09 +02:00
masensio
b110b598b3 Remove READ_PHONE_STATE permission 2015-03-25 23:34:14 +01:00
masensio
fb541b1e1d Update Version Number and Version Name 2015-03-25 23:19:39 +01:00
masensio
cb175f2994 Merge branch 'develop' into cancel_transfer_for_deleted_users 
Conflicts:
	AndroidManifest.xml
 2015-02-19 12:54:59 +01:00
masensio
2058391230 Cancel downloads for deleted users 2015-02-18 18:39:10 +01:00
David A. Velasco
1ee808f3a2 Updated version number to 1.7.0 2015-02-03 12:52:17 +01:00
David A. Velasco
2f4e2808d2 Internal version bump 2015-01-30 11:49:31 +01:00
David A. Velasco
c21c8e118b Version bump 2015-01-26 11:49:27 +01:00
David A. Velasco
44c0d86ede Merge pull request #752 from owncloud/instant_uploads_set_path 
Better UI for settings path of instant uploads
 2014-11-26 13:10:04 +01:00
jabarros
5c0e9ca5f2 Changes after CR 2014-11-26 09:05:23 +01:00
jabarros
8d505deed1 Update version number and name 2014-11-20 18:01:05 +01:00
jabarros
00a8eb415a Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend 2014-11-18 14:51:49 +01:00
David A. Velasco
2d6e7e3aaf Bump app version to 1.6.1 2014-10-24 10:51:40 +02:00
jabarros
9a5a4c127a Update version number and name 2014-09-18 10:52:37 +02:00
jabarros
a0442b48b1 Fixed bug. Copy link when sharing a file has dissapear 2014-09-04 18:04:55 +02:00
jabarros
dc984ec5bf Add new activity for selecting the destination folder when moving files, including new List Fragment and new Adapter for listing only the folders 2014-08-13 16:43:50 +02:00
jabarros
c4359ce393 Remove classes not used more after changing the view of OC accounts 2014-08-07 16:23:42 +02:00
jabarros
055be96386 Remove InstantUploadActivity and related resources 2014-07-14 08:40:16 +02:00
David A. Velasco
49c69609ea Merge branch 'develop' into release-1.5.8 2014-07-09 12:27:35 +02:00
David A. Velasco
0a99d90727 Only relative packages in AndroidManifest 2014-07-09 11:01:48 +02:00
David A. Velasco
c880929ffd Fixed last minute bugs, and clean up 2014-07-08 12:51:01 +02:00
jabarros
0ed5d39993 Update version number and name 2014-07-07 14:38:19 +02:00
David A. Velasco
40ae6d841f Updated version numbers 2014-06-02 14:51:35 +02:00
masensio
76c2cf5b84 Update version number to 1.5.6, 1.0.15(workaround) 2014-05-28 17:17:24 +02:00
masensio
3351db6527 Merge branch 'develop' into videoInstandUploads 2014-04-08 12:50:50 +02:00
masensio
407fb8f912 Update versionName and versionCode in AndroidManifest.xml (oc and workaround)) 2014-03-18 14:54:00 +01:00
David A. Velasco
ebcc9b98e3 Alternative solution for fix in 10f99ceb9ca... enforcing dialog dissmiss instead of introducing false specific onConfigurationChange 2014-03-06 16:29:21 +01:00
masensio
10f99ceb9c OC-3079: (fix bug) Two send options appear after send and mail with a ownCloud file 2014-02-26 11:05:25 +01:00
David A. Velasco
42fc189367 Implemented option to copy shared link in clipboard instead of trusting in external clipboard front-ends 2014-02-19 18:00:49 +01:00
David A. Velasco
d6ac750421 Version up: 1.5.4 and JB workaround 1.0.12 2014-02-07 09:25:58 +01:00
David A. Velasco
59513cd56d Merge branch 'share_link__new_share' into share_link__new_share_menu 2014-02-03 09:46:26 +01:00
David A. Velasco
b447bf973f Added standard menu to select app used to send the link to share a file 2014-01-31 10:43:25 +01:00
David A. Velasco
871d5ea05d Moved execution of GetSharesOperation to OperationsService 2014-01-30 17:58:35 +01:00
David A. Velasco
30198bb105 App version up: 1.5.3 2014-01-21 14:41:46 +01:00
David A. Velasco
0a6c488139 Version up to 1.5.2 2013-12-05 18:06:02 +01:00
David A. Velasco
34923cf74b Merge branch 'master' into develop 2013-12-04 12:09:22 +01:00
David A. Velasco
6aac9ce9ea Version up: 1.5.1 2013-12-04 10:21:17 +01:00
David A. Velasco
732cfcede8 Removed synchronization in independent process to avoid problem in reload of certificates due to separate contexts 2013-11-29 12:14:27 +01:00
David A. Velasco
e1245bbda7 Merge branch 'develop' into refactor_remote_operation_to_create_folder 2013-11-18 14:10:16 +01:00