Commit graph

2564 commits

Author SHA1 Message Date
Andy Scherzinger
fa23f001d9 fix strings.xml 2016-09-10 13:57:22 +02:00
Andy Scherzinger
be08193007 show toast if davdroid sync has been setup successfully 2016-09-10 13:53:49 +02:00
Andy Scherzinger
4533d5f47f move setup call to settings screen 2016-09-10 13:53:49 +02:00
Andy Scherzinger
2845cf521a wip davdroid login launch 2016-09-10 13:53:49 +02:00
Nextcloud bot
3a86b88eb1
[tx-robot] updated from transifex 2016-09-10 00:33:50 +00:00
Tobias Kaminsky
71f6cf0001 Merge pull request #246 from nextcloud/130rcBugfix
1.3.0 RC Bugfixes
2016-09-09 17:58:12 +02:00
Andy Scherzinger
1ad35b92fa linebreak 2016-09-09 12:24:50 +02:00
Andy Scherzinger
67386e3afc added line break 2016-09-09 12:16:19 +02:00
Nextcloud bot
7bfe31eabf
[tx-robot] updated from transifex 2016-09-09 00:33:48 +00:00
Andy Scherzinger
166081ed9e shorten translate text 2016-09-08 13:38:20 +02:00
Andy Scherzinger
34c186bd8c added transifex hint for translations 2016-09-08 13:34:54 +02:00
Andy Scherzinger
d1fdbe44b0 fixed layouting for participate text 2016-09-08 10:29:59 +02:00
Andy Scherzinger
1b3bdc3eb8 consistent wording for upload options --> folder 2016-09-08 10:29:59 +02:00
Andy Scherzinger
db291cdf87 improve layouting and texts for upload behavior #26 2016-09-08 10:29:59 +02:00
Andy Scherzinger
9a36b3508f bugfix layouting and issue reporting button click 2016-09-08 10:29:59 +02:00
Andy Scherzinger
f8108b2162 Bugfix report GH issue button click 2016-09-08 10:29:59 +02:00
Nextcloud bot
3f469c6b45
[tx-robot] updated from transifex 2016-09-08 00:33:53 +00:00
Nextcloud bot
7af508a4e4
[tx-robot] updated from transifex 2016-09-07 00:33:40 +00:00
Andy Scherzinger
07f5d9546e revamped participation activity content based on the feedback 2016-09-06 19:36:02 +02:00
Andy Scherzinger
660e5a8923 fix for triggering the main drawer menu items from "participate", changed participate icon and checkable behavior, don't show settings etc when showing accounts 2016-09-06 17:25:57 +02:00
Andy Scherzinger
7f200c5f1a participate icon 2016-09-06 17:25:57 +02:00
Andy Scherzinger
aac14ed031 slight whitespace optimizations in accordance with material design guidelines 2016-09-06 17:25:57 +02:00
tobiasKaminsky
f75f8e5ca3 fix wrong new line 2016-09-06 17:25:57 +02:00
tobiasKaminsky
c206c944bc links are now extracted to setup.xml 2016-09-06 17:25:57 +02:00
tobiasKaminsky
a24f89be16 wip 2016-09-06 17:25:57 +02:00
Andy Scherzinger
fe357bb35b small layout optimizations 2016-09-06 16:58:41 +02:00
Andy Scherzinger
e45816a5ed fix string arrays, so n.o. elements doesn't depend on translation status, make upload spinner translatable 2016-09-06 16:17:14 +02:00
tobiasKaminsky
1ad97d9ff7 move / copy updated 2016-09-06 14:46:03 +02:00
Andy Scherzinger
b8905bdb32 minor code reformattings and cleanup 2016-09-06 14:04:28 +02:00
tobiasKaminsky
90f582105f show compatibility warning 2016-09-06 10:36:07 +02:00
tobiasKaminsky
1ace509e4f wip 2016-09-06 10:36:07 +02:00
Nextcloud bot
69c801206c
[tx-robot] updated from transifex 2016-09-06 00:33:48 +00:00
Nextcloud bot
bb62f9d404
[tx-robot] updated from transifex 2016-09-05 00:33:50 +00:00
Andy Scherzinger
32be5dfeb3 Merge pull request #171 from nextcloud/uploadWhenCharging
Upload when charging
2016-09-04 19:12:44 +02:00
Nextcloud bot
c1f6eb082a
[tx-robot] updated from transifex 2016-09-04 00:33:48 +00:00
Tobias Kaminsky
be6f189f30 Merge pull request #235 from nextcloud/fixRemoteFolderSize
Restore display of remote folder size
2016-09-03 20:26:08 +02:00
tobiasKaminsky
77f9902f17 Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging 2016-09-03 20:10:51 +02:00
Nextcloud bot
d75f5e7bfc
[tx-robot] updated from transifex 2016-09-03 00:33:49 +00:00
Nextcloud bot
14846586b8
[tx-robot] updated from transifex 2016-09-02 00:33:53 +00:00
Andy Scherzinger
70e8f62581 Added 'Pending' placeholder for still-unknown size of incoming federated folders 2016-09-01 14:42:55 +02:00
Andy Scherzinger
303b05a3a6 Merge pull request #204 from nextcloud/quotaDisplay
Display quota if configured/available in navigation drawer
2016-09-01 11:03:14 +02:00
Nextcloud bot
2326d4b32a
[tx-robot] updated from transifex 2016-09-01 00:34:00 +00:00
Andy Scherzinger
457027a196 fixed the background color 2016-08-18 15:55:11 +02:00
Andy Scherzinger
0f80bdc894 CR changes 2016-08-18 15:55:11 +02:00
Andy Scherzinger
5280d66139 colorize quota progress bar depending on thresholds met, reformattings 2016-08-18 15:55:11 +02:00
Andy Scherzinger
f8e0ee9ce1 initial quota display implementation 2016-08-18 15:55:11 +02:00
Andy Scherzinger
e790d4a520 initial layout changes for in drawer quota display 2016-08-18 15:55:11 +02:00
Nextcloud bot
c2f3519648
[tx-robot] updated from transifex 2016-08-17 00:33:47 +00:00
Andy Scherzinger
aa98938a55 textfile --> text file 2016-08-16 11:58:42 +02:00
tobiasKaminsky
993264c8b1 wip 2016-08-16 11:58:42 +02:00
Andy Scherzinger
1c874aafec add background image to drawer header 2016-08-14 22:32:41 +02:00
Nextcloud bot
53c360e149
[tx-robot] updated from transifex 2016-08-12 00:33:49 +00:00
Nextcloud bot
283b5cb77b
[tx-robot] updated from transifex 2016-08-09 00:33:50 +00:00
Nextcloud bot
ffd198dc79
[tx-robot] updated from transifex 2016-08-06 00:33:48 +00:00
Nextcloud bot
f0e1f77fc0
[tx-robot] updated from transifex 2016-08-05 00:33:49 +00:00
Nextcloud bot
6e78cc7e33
[tx-robot] updated from transifex 2016-08-04 00:33:48 +00:00
Andy Scherzinger
5518e8257e hide non-primary action menu items in overflow menu 2016-08-03 19:20:44 +02:00
Andy Scherzinger
b869538846 added description and went for ifRoom 2016-08-03 19:20:44 +02:00
Andy Scherzinger
14be68d4b1 fix UI behavior for filtering in upload view 2016-08-03 19:20:44 +02:00
Andy Scherzinger
4c6f1c0faa correct search view UI-behavior 2016-08-03 19:20:44 +02:00
tobiasKaminsky
a3a6420ead filter for oc file list and local file list 2016-08-03 19:20:44 +02:00
Nextcloud bot
a05957125c
[tx-robot] updated from transifex 2016-08-03 00:33:53 +00:00
Nextcloud bot
9bdf13e801
[tx-robot] updated from transifex 2016-08-02 00:33:56 +00:00
Andy Scherzinger
9ce3297f65 Merge pull request #162 from nextcloud/renameInstantUploadPath
rename instant upload path
2016-08-01 14:47:07 +02:00
Nextcloud bot
b5cf7ab074
[tx-robot] updated from transifex 2016-08-01 00:33:52 +00:00
Nextcloud bot
7c2c537bad
[tx-robot] updated from transifex 2016-07-31 00:33:50 +00:00
tobiasKaminsky
ac695b7444 fix sharing for beta 2016-07-30 18:38:21 +02:00
tobiasKaminsky
9587af3e9d Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging 2016-07-30 16:56:44 +02:00
Nextcloud bot
6bf6981a41
[tx-robot] updated from transifex 2016-07-30 00:33:42 +00:00
Nextcloud bot
9e406be4ff
[tx-robot] updated from transifex 2016-07-29 00:33:48 +00:00
tobiasKaminsky
eff2aa1971 rename instant upload path 2016-07-28 19:09:46 +02:00
Nextcloud bot
0626040e7b
[tx-robot] updated from transifex 2016-07-27 00:33:55 +00:00
Nextcloud bot
6c887b41b4
[tx-robot] updated from transifex 2016-07-26 00:33:52 +00:00
Nextcloud bot
5cfaa5ec02
[tx-robot] updated from transifex 2016-07-25 00:33:45 +00:00
Nextcloud bot
8876f52c4d
[tx-robot] updated from transifex 2016-07-24 00:33:49 +00:00
Nextcloud bot
ca0e550059
[tx-robot] updated from transifex 2016-07-23 00:33:47 +00:00
Nextcloud bot
00d4403326
[tx-robot] updated from transifex 2016-07-22 00:33:50 +00:00
Andy Scherzinger
e865658f62 corrected paddings/margin to material design 16/8 dp 2016-07-21 13:45:43 +02:00
Andy Scherzinger
55c0dcc3b0 Merge pull request #61 from nextcloud/multiSelectNew
Multi Select
2016-07-21 13:02:27 +02:00
Nextcloud bot
9ef0c18e81
[tx-robot] updated from transifex 2016-07-21 00:33:56 +00:00
Andy Scherzinger
62c918f59a Merge 'master' including conflict fixing
Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2016-07-20 15:26:59 +02:00
Andy Scherzinger
1876746481 Merge pull request #36 from nextcloud/video_thumbnail
Video thumbnail
2016-07-20 15:20:26 +02:00
Andy Scherzinger
2af26edb0b Merge branch 'master' of https://github.com/nextcloud/android into multiSelectNew
Conflicts:
	res/values-ca/strings.xml
	res/values-he/strings.xml
	res/values-hu-rHU/strings.xml
	res/values-ja-rJP/strings.xml
	res/values-ko/strings.xml
	res/values-lb/strings.xml
	res/values-lt-rLT/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-th-rTH/strings.xml
	res/values-tr/strings.xml
2016-07-20 13:19:41 +02:00
Andy Scherzinger
ecf1f9e3da proper status bar coloring for multi select mode, cleanup logging 2016-07-20 13:09:56 +02:00
Nextcloud bot
22b9ad807c
[tx-robot] updated from transifex 2016-07-20 00:33:48 +00:00
Nextcloud bot
7f9cf817a7
[tx-robot] updated from transifex 2016-07-19 00:33:47 +00:00
Andy Scherzinger
2bfb1b6903 fixed overlay bug with toolbar 2016-07-18 17:38:02 +02:00
Nextcloud bot
5ef50c6658
[tx-robot] updated from transifex 2016-07-18 13:28:56 +00:00
tobiasKaminsky
e714707754 textPreview is selectable 2016-07-16 09:08:52 +02:00
tobiasKaminsky
ff32763024 update to master 2016-07-15 20:15:59 +02:00
tobiasKaminsky
98a679548a Merge remote-tracking branch 'remotes/origin/master' into multiSelectNew 2016-07-15 18:32:56 +02:00
tobiasKaminsky
411e5392bc Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail 2016-07-15 18:05:05 +02:00
Andy Scherzinger
fca1e0d2fd added line breaks according to CR 2016-07-14 23:31:48 +02:00
Andy Scherzinger
956edc5e7a use nextcloud trashbin icon 2016-07-14 23:31:47 +02:00
Bartosz Przybylski
6ad28b5250 change close icon to delete icon 2016-07-14 23:31:47 +02:00
Bartosz Przybylski
098cf7dd46 Add confirmation dialog on account deletion 2016-07-14 23:31:46 +02:00
Andy Scherzinger
f1e2f1151b recovered icon after rebase 2016-07-14 22:45:29 +02:00
Andy Scherzinger
1119702fe2 cleanup iconwork 2016-07-14 22:43:19 +02:00
Andy Scherzinger
55e088e33a renamed icon, fixed string ref for Uploads drawer item 2016-07-14 22:43:19 +02:00
Andy Scherzinger
9c76e2828c proper on device icon 2016-07-14 22:42:24 +02:00
Andy Scherzinger
d1f9cae7f4 cleanup, accounts is handled differently with latest implementation (housekeeping here) 2016-07-14 22:42:23 +02:00
Andy Scherzinger
a33a03a928 adaption after rebase to switch between all/offline files 2016-07-14 22:42:23 +02:00
Andy Scherzinger
2a7ce555b9 fixed icon (+naming) to use resolution depended icon and don't scale 2016-07-14 22:42:20 +02:00
Andy Scherzinger
6e2a6326f0 download icon 2016-07-14 22:42:20 +02:00
tobiasKaminsky
a1d3a10146 add missing file 2016-07-14 22:42:19 +02:00
tobiasKaminsky
9d74b7e223 enabled all occurrences. 2016-07-14 22:42:18 +02:00
Andy Scherzinger
d00893c66a Merge pull request #124 from nextcloud/sortInUploadFilesActivity
Sort in upload files activity
2016-07-14 22:38:04 +02:00
Andy Scherzinger
19b711f2d8 cleanup menus 2016-07-14 14:48:22 +02:00
tobiasKaminsky
4c20679538 add sort to UploadFileActiviy 2016-07-14 14:31:46 +02:00
Andy Scherzinger
ef031c6c65 further icon fixed and completion of all custom/internal icons, so no references to OS version specific icon works anymore 2016-07-14 14:12:34 +02:00
Andy Scherzinger
61855fa179 added missing sort variant icon sizes 2016-07-14 12:59:44 +02:00
Andy Scherzinger
8f6c7eeb1d icon housekeeping: mdpi->24dp sizing, added missing warning icon 2016-07-14 10:58:23 +02:00
Andy Scherzinger
758bf3ba05 icon housekeeping: hdpi->24dp sizing, removal of unused icon work 2016-07-14 10:52:27 +02:00
tobiasKaminsky
6c1deae1a2 use size computed by server 2016-07-13 11:04:43 +02:00
David A. Velasco
5fdd54fc11 Added set/unset available offline action icons for tablets ignoring 'showAsAction=never' when action is the only one in the overflow menu 2016-07-12 19:26:43 +02:00
David A. Velasco
899bfd414a Updated download action icon to diff from available offline status 2016-07-12 19:26:43 +02:00
David A. Velasco
c86b0c5c6b No legacy icon in action bar 2016-07-12 15:31:49 +02:00
David A. Velasco
25f623be8f New 'move' icon; fixed hdpi, mdpi icons 2016-07-12 15:31:48 +02:00
Andy Scherzinger
73013210a3 revert user agent due to server side checks 2016-07-12 14:50:43 +02:00
David A. Velasco
db6acc6868 Clean-up and small refactorings
Conflicts:
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2016-07-09 19:49:37 +02:00
David A. Velasco
fae65e5b1e Revert changes in translated string resources.
This reverts part of commit f44c74033527c2c3b36b552cca7519e7ec3b13ce.
2016-07-09 19:47:25 +02:00
Nextcloud bot
6a3e94e12a
[tx-robot] updated from transifex 2016-07-07 20:44:54 +00:00
Jan-Christoph Borchardt
a4dabfb3df Merge pull request #89 from nextcloud/launcherIcon
New launcher icon
2016-07-04 15:21:08 +02:00
Andy Scherzinger
fdf0e0510e fixed Google Play link 2016-07-02 19:59:30 +02:00
Andy Scherzinger
bd11c2052a fixed padding 2016-07-02 19:05:08 +02:00
Andy Scherzinger
339d37fe7a revamped launcher icon 2016-07-02 19:05:07 +02:00
tobiasKaminsky
1edc488995 Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail 2016-07-02 17:49:16 +02:00
tobiasKaminsky
77573a3535 new feedback email address
url help adjusted
2016-07-01 17:46:25 +02:00
Andy Scherzinger
ab136a14a3 Merge branch 'multiSelect' of https://github.com/owncloud/android into multiSelectNew
Conflicts:
	build.gradle
	oc_jb_workaround/build.gradle
	owncloud-android-library
	res/layout/uploader_layout.xml
	res/layout/uploader_list_item_layout.xml
	res/menu/file_actions_menu.xml
	res/values/setup.xml
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
	src/com/owncloud/android/db/PreferenceManager.java
	src/com/owncloud/android/files/FileMenuFilter.java
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2016-06-30 15:11:34 +02:00
Andy Scherzinger
5d7c1f31e7 new open in app icon during multi select 2016-06-30 10:53:57 +02:00
Marius Blüm
36b24a9673 Merge pull request #75 from nextcloud/loginLayout
Slight design optimizations for the login screen #22
2016-06-27 18:52:53 +02:00
Andy Scherzinger
bc94cbf631 login button colors changed 2016-06-27 16:36:45 +02:00
Andy Scherzinger
c875bbace1 Merge pull request #35 from nextcloud/feature_uploadsubfolders
Feature uploadsubfolders
2016-06-27 10:45:41 +02:00
Andy Scherzinger
718fec0935 remove card view, change edit text and icon coloring 2016-06-26 22:59:28 +02:00
Andy Scherzinger
d6e31a20d5 fix progressbar within toolbar 2016-06-25 16:27:27 +02:00
Andy Scherzinger
bd7a50aabc add constants for margins and use different placeholder 2016-06-25 16:27:23 +02:00
Andy Scherzinger
7ff136854b layout fixes after rebase 2016-06-25 16:27:22 +02:00
Andy Scherzinger
5c88b03721 List divider Fix 2016-06-25 16:27:21 +02:00
Andy Scherzinger
e5cc51e07e add toolbar to log screen 2016-06-25 16:27:18 +02:00
Andy Scherzinger
993a681cf8 fixed size differences of generated and image based avatars 2016-06-25 16:27:18 +02:00
Andy Scherzinger
892cfd6f8f avatar loading for account manager too + house keeping 2016-06-25 16:27:17 +02:00
Andy Scherzinger
06dc13601e drawer preparations for "On Device" menu item 2016-06-25 16:27:15 +02:00
Andy Scherzinger
dfe15c4b00 set navigation view menu icon size for avatars according to Google's guidelines: 14sp 2016-06-25 16:27:15 +02:00
Andy Scherzinger
86dc83a96a ellipsized superlong username in the dropdown list 2016-06-25 16:27:14 +02:00
Andy Scherzinger
cf158abbb6 aligned management screen with material design sizings 2016-06-25 16:27:13 +02:00
Andy Scherzinger
ff75f71836 move avatar helper method to TextDrawable, define everything in dp to be independent 2016-06-25 16:27:12 +02:00
Andy Scherzinger
aed4b6f7ea color fix for EditText (due to wrong parent style) 2016-06-25 16:27:11 +02:00
Andy Scherzinger
56e84a2c7f Fix for dynamic avatar sizing for generic letter/circle avatars 2016-06-25 16:27:10 +02:00
Andy Scherzinger
583dca5cbc rudimentary drawer header / avatar based account switching. 2016-06-25 16:27:10 +02:00
tobiasKaminsky
8dbb5b6305 wip
Conflicts:
	res/layout/drawer.xml
	src/com/owncloud/android/ui/activity/FileActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
2016-06-25 16:27:08 +02:00
Andy Scherzinger
acf77ddc04 standard header layouting, flexible avatar radius, code cleanups, dynamic avatar sizing 2016-06-25 16:27:06 +02:00
Andy Scherzinger
b60e1828e2 removed now unused drawer resource file due to new implementation 2016-06-25 16:27:05 +02:00
Andy Scherzinger
bf3deb49a2 rebase fixes 2016-06-25 16:27:04 +02:00
Andy Scherzinger
576b7b11dc layout fix due to added toolbar + oC license added 2016-06-25 16:27:03 +02:00
Andy Scherzinger
349f01df09 Color of progress bar now aligned with action bar color via color.xml config 2016-06-25 16:27:03 +02:00
Andy Scherzinger
3a63a635e2 larger hitbox for the account switcher 2016-06-25 16:26:59 +02:00
Andy Scherzinger
f7178fa837 housekeeping Preferences, removed all accounts related code 2016-06-25 16:26:57 +02:00
Andy Scherzinger
37da1a7920 wip account management - account list changes aren't propagated back to the drawer yet, preferences haven't been cleaned up yet 2016-06-25 16:26:52 +02:00
Andy Scherzinger
7f72e8cabd housekeeping removing old account switching code 2016-06-25 16:26:51 +02:00
Andy Scherzinger
7e2c560004 circle icons for accounts with color coding 2016-06-25 16:26:49 +02:00
Andy Scherzinger
f41e567b90 general menu/account list switch implemented (open: populate account list) 2016-06-25 16:26:47 +02:00
Andy Scherzinger
f82c4d96ba initial account chooser toggle and further abstraction of the drawer API for child classes 2016-06-25 16:26:47 +02:00
Andy Scherzinger
ce803aa4e0 initial (functionless) account switcher for the drawer header and display size depending header sizing 2016-06-25 16:26:46 +02:00
Andy Scherzinger
29d8288bd5 initial bug fix for the uploader 2016-06-25 16:26:46 +02:00
Andy Scherzinger
8cb4e8f2bf navigation bug fix for previewing text files 2016-06-25 16:26:45 +02:00
Andy Scherzinger
ed33c0aff4 initial rewrite to make use of the toolbar 2016-06-25 16:26:44 +02:00
David Wiesner
4f7d3d4fd1 fix: GridView not restore selected positions but getCheckedItemCount ill return right value 2016-06-24 12:11:31 +02:00
David Wiesner
659f280a8b build fixes 2016-06-24 12:11:31 +02:00
David A. Velasco
301ec578bc Fix crash due to obsolete string resources 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
9af6bf238c Remove deprecated code after last update 2016-06-24 12:11:31 +02:00
Juan Carlos González Cabrero
dd5cb1ad6a Disable favorite actions from multiple context menu 2016-06-24 12:11:31 +02:00
Andy Scherzinger
29aa48c8a7 align checkbox top left 2016-06-24 12:11:31 +02:00
Andy Scherzinger
cae4f248e5 fixed color references and list item layout for multi select 2016-06-24 12:11:31 +02:00
Andy Scherzinger
ef739c5d81 fixed coloring and material style for multi select 2016-06-24 12:11:31 +02:00
tobiasKaminsky
3f108e7a52 changes according to CR 2016-06-24 12:11:31 +02:00
Andy Scherzinger
4380290d90 code review fixes 2016-06-24 12:11:31 +02:00
Andy Scherzinger
2e65ffcf4f grey system bar coloring on multi select 2016-06-24 12:11:31 +02:00
Andy Scherzinger
fdcb17cd57 Fiy multiselect styling for action bar mode 2016-06-24 12:11:31 +02:00
Andy Scherzinger
e7fa658994 added menu item icons in material style for multi select display 2016-06-24 12:11:31 +02:00
tobiasKaminsky
f1cba47d40 wip 2016-06-24 12:11:31 +02:00
tobiasKaminsky
d142cca6ab wip 2016-06-24 12:11:31 +02:00
tobiasKaminsky
d761f24572 wip 2016-06-24 12:11:31 +02:00
Jenkins for ownCloud
62c83dc102 [tx-robot] updated from transifex 2016-06-24 01:14:05 -04:00
tobiasKaminsky
ee01a1ad1d add missing files 2016-06-23 21:23:52 +02:00
tobiasKaminsky
1183e51c19 Merge remote-tracking branch 'owncloud/multiSelect' into multiSelectOwncloud
# Conflicts:
#	res/drawable-hdpi/ic_checkbox_marked.png
#	res/drawable-mdpi/ic_checkbox_marked.png
#	res/drawable-xhdpi/ic_checkbox_marked.png
#	res/drawable-xxhdpi/ic_checkbox_marked.png
#	res/layout/grid_image.xml
#	res/values/strings.xml
#	src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java
#	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
#	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
#	src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
#	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2016-06-23 21:10:58 +02:00
Andy Scherzinger
f73f78fb28 Merge pull request #55 from nextcloud/setupScreenImprovement
Update welcome url, fixes #16
2016-06-23 11:06:01 +02:00
Jenkins for ownCloud
aa118551e3 [tx-robot] updated from transifex 2016-06-23 01:13:52 -04:00
Andy Scherzinger
207801c000 Update welcome url, fixes #16 2016-06-22 19:14:19 +02:00
Andy Scherzinger
2c256bf53d added the ability to select all within a folder for upload - selection is discarded when navigating folders 2016-06-22 16:43:23 +02:00
Jenkins for ownCloud
9e65ac0365 [tx-robot] updated from transifex 2016-06-22 01:14:06 -04:00
Bartosz Przybylski
db7a4641c2 Add documents provider 2016-06-20 22:15:02 +02:00
Jenkins for ownCloud
674a094334 [tx-robot] updated from transifex 2016-06-20 01:13:38 -04:00
Timo Witte
3c388ad120 implement the same for videos and do some code cleanup 2016-06-19 23:53:15 +02:00
tobiasKaminsky
bed5a16e1f Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail 2016-06-19 18:23:06 +02:00
tobiasKaminsky
2c7256e835 Merge remote-tracking branch 'remotes/origin/videoBigThumbnails' into video_thumbnail 2016-06-19 18:22:45 +02:00
Timo Witte
f68b53ba61 introduce upload subfolders configuration variable 2016-06-19 16:43:12 +02:00
Jenkins for ownCloud
39a2d79841 [tx-robot] updated from transifex 2016-06-19 01:13:46 -04:00
Jenkins for ownCloud
18fa573009 [tx-robot] updated from transifex 2016-06-17 01:14:15 -04:00
Jenkins for ownCloud
6333e30558 [tx-robot] updated from transifex 2016-06-16 01:14:13 -04:00
Jenkins for ownCloud
f361398d5f [tx-robot] updated from transifex 2016-06-15 01:14:37 -04:00
Andy Scherzinger
0db0ab1fd5 layouting changes so file list, local list and uploader list look the same 2016-06-14 09:55:24 +02:00
Andy Scherzinger
68849c7305 code review: fixed minor layout optimizations, set generic preference methods to private visibility 2016-06-14 09:55:22 +02:00
Andy Scherzinger
9bbd7ee103 proper padding for the choose upload folder buttons 2016-06-14 09:55:16 +02:00
Andy Scherzinger
ef0b5030e1 fix background color 2016-06-14 09:55:14 +02:00
Andy Scherzinger
d74f5fdc2a implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-14 09:55:14 +02:00
Jenkins for ownCloud
932c66d4c5 [tx-robot] updated from transifex 2016-06-14 01:13:59 -04:00
Andy Scherzinger
944af7e62b code review plus fixed for the layouts and data to be displayed
now all file list view (uploader, upload external and standard file list have the same layout)
2016-06-13 21:50:11 +02:00
Andy Scherzinger
bce26b4935 changes padding 2016-06-13 21:50:09 +02:00
Andy Scherzinger
e0a283a876 rebase changes with master 2016-06-13 21:50:08 +02:00
Andy Scherzinger
593e3e900f proper padding for the choose upload folder buttons 2016-06-13 21:50:07 +02:00
Andy Scherzinger
acdd68d775 fix background color 2016-06-13 21:50:06 +02:00
Andy Scherzinger
74fa10964a implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-13 21:50:05 +02:00
Andy Scherzinger
cd0082c5e4 proper padding for the choose upload folder buttons 2016-06-13 21:49:59 +02:00
Andy Scherzinger
a3359d0a48 fix background color 2016-06-13 21:49:57 +02:00
Andy Scherzinger
cecab96b2f implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-13 21:49:57 +02:00
Jenkins for ownCloud
00e7c102c2 [tx-robot] updated from transifex 2016-06-12 01:13:58 -04:00
Andy Scherzinger
34d9a4cd8b Merge branch 'master' of https://github.com/owncloud/android 2016-06-11 19:16:04 +02:00
Andy Scherzinger
e2ec8498b8 replaced login icon, reworked login now using card views 2016-06-11 18:09:54 +02:00
Andy Scherzinger
f63d421777 launcher icon replacement matching the server icon 2016-06-11 17:13:59 +02:00
Andy Scherzinger
d93c50bab5 inverted launcher icon 2016-06-11 17:07:39 +02:00
Jenkins for ownCloud
be93f8dbab [tx-robot] updated from transifex 2016-06-10 01:13:57 -04:00
Andy Scherzinger
c9a3397aac minor search provider config 2016-06-09 19:16:14 +02:00
Andy Scherzinger
3521017fb3 configure nc again 2016-06-09 19:15:52 +02:00
Andy Scherzinger
f45d958c19 nextcloud notification icon 2016-06-09 17:52:37 +02:00
Andy Scherzinger
65775f1c6b adjusting the icon work to nextcloud + high resolution images 2016-06-09 17:52:37 +02:00
Andy Scherzinger
91682b616c replace launcher icon including seasonal icon removal 2016-06-09 17:52:35 +02:00
Jenkins for ownCloud
110ea08b36 [tx-robot] updated from transifex 2016-06-09 01:13:52 -04:00
Andy Scherzinger
8b0bab8feb nextcloud logo for login 2016-06-08 16:46:31 +02:00
Andy Scherzinger
1533c6b52c corresponding primary dark color 2016-06-08 16:17:43 +02:00
Jenkins for ownCloud
6d2747c199 [tx-robot] updated from transifex 2016-06-08 01:13:57 -04:00
tobiasKaminsky
1147778794 allow nextcloud to be parallel to owncloud 2016-06-07 21:58:37 +02:00
Andy Scherzinger
38946243ac min-version is 14 so merged -v11 with standard folders for artwork 2016-06-07 13:24:45 +02:00
Andy Scherzinger
105541c4b0 moved to a brighter accent color 2016-06-07 12:11:05 +02:00
Andy Scherzinger
067263049a changed progress bar coloring 2016-06-07 11:09:41 +02:00
Andy Scherzinger
567375e860 initial color changed to nextcloud blue 2016-06-07 10:31:12 +02:00
Jenkins for ownCloud
49fddadd80 [tx-robot] updated from transifex 2016-06-07 01:14:21 -04:00
Jenkins for ownCloud
600225c7c9 [tx-robot] updated from transifex 2016-06-06 01:13:55 -04:00
Jenkins for ownCloud
9d52814950 [tx-robot] updated from transifex 2016-06-05 01:13:34 -04:00
Jenkins for ownCloud
ca515669c2 [tx-robot] updated from transifex 2016-06-04 01:13:53 -04:00
Jenkins for ownCloud
418f240aa3 [tx-robot] updated from transifex 2016-06-03 01:13:59 -04:00
Andy Scherzinger
2fec9e8ea0 mdpi checkmark 2016-06-02 13:39:11 +02:00
Andy Scherzinger
9e4e93a5bc fixed checkmark color 2016-06-02 13:39:11 +02:00
Andy Scherzinger
dd8a18508e added semi transparent checmark to checked checkbox image (see #1415) 2016-06-02 13:39:10 +02:00
Jenkins for ownCloud
4edb808b50 [tx-robot] updated from transifex 2016-06-02 01:13:57 -04:00
jabarros
ad32dfea20 Added white border to available offline icon 2016-06-01 17:07:13 +02:00
Andy Scherzinger
9bb572e3e7 fixed sizes of the available offline icon and added a xxhdpi variant 2016-06-01 17:07:13 +02:00
jabarros
b15b49f56f Revert the remove of favorite icon (star) 2016-06-01 17:07:13 +02:00
jabarros
26c7a451e1 Change 'Favorite/Unfavorite' item menu to 'Set/Unset as available offline' 2016-06-01 17:07:13 +02:00
jabarros
e11eecd2b5 Change favorite icon to available offline new one 2016-06-01 17:07:13 +02:00
jabarros
a9a944799e Added and changed synchronizing, sync error and successfully synced icons 2016-06-01 17:07:13 +02:00
Jenkins for ownCloud
1c0bc898f2 [tx-robot] updated from transifex 2016-06-01 01:16:10 -04:00
Jenkins for ownCloud
f1b66e1281 [tx-robot] updated from transifex 2016-05-30 01:13:57 -04:00
Jenkins for ownCloud
de30acbbf7 [tx-robot] updated from transifex 2016-05-27 01:13:51 -04:00
Jenkins for ownCloud
6fdbb65d23 [tx-robot] updated from transifex 2016-05-26 01:13:50 -04:00
Jenkins for ownCloud
78540e4e02 [tx-robot] updated from transifex 2016-05-25 01:13:51 -04:00
Jenkins for ownCloud
2b60acf5e1 [tx-robot] updated from transifex 2016-05-22 01:13:49 -04:00
Jenkins for ownCloud
088eafacdf [tx-robot] updated from transifex 2016-05-21 01:13:51 -04:00
Jenkins for ownCloud
4a8e8b3c4a [tx-robot] updated from transifex 2016-05-20 01:13:51 -04:00
Jenkins for ownCloud
37d1ce6db3 [tx-robot] updated from transifex 2016-05-19 01:13:50 -04:00
Andy Scherzinger
e80d1465cd show log preference item only for debug mode or flag set true (false by default) 2016-05-18 12:35:58 +02:00
Andy Scherzinger
74a05bb2a9 moved logs from drawer menu to "More" section in the settings 2016-05-18 12:35:57 +02:00
Jenkins for ownCloud
37c96a4fb0 [tx-robot] updated from transifex 2016-05-18 01:13:49 -04:00
Jenkins for ownCloud
109a056319 [tx-robot] updated from transifex 2016-05-17 01:13:38 -04:00
Jenkins for ownCloud
f10fff8715 [tx-robot] updated from transifex 2016-05-16 01:13:47 -04:00
Jenkins for ownCloud
8230eff901 [tx-robot] updated from transifex 2016-05-15 01:13:34 -04:00
Jenkins for ownCloud
da9dfadd14 [tx-robot] updated from transifex 2016-05-09 01:13:39 -04:00
Jenkins for ownCloud
30c4786250 [tx-robot] updated from transifex 2016-05-06 01:13:45 -04:00
Jenkins for ownCloud
0c26fc9a33 [tx-robot] updated from transifex 2016-05-04 01:13:51 -04:00
Juan Carlos González Cabrero
f9dcd8c700 Change the default text color of login view to black 2016-05-03 11:06:17 +02:00
Jenkins for ownCloud
735af7de27 [tx-robot] updated from transifex 2016-05-03 01:13:49 -04:00
Jenkins for ownCloud
a0c7a11cf2 [tx-robot] updated from transifex 2016-05-02 01:13:48 -04:00
Jenkins for ownCloud
46aae27831 [tx-robot] updated from transifex 2016-05-01 01:13:48 -04:00
Jenkins for ownCloud
829433348d [tx-robot] updated from transifex 2016-04-30 01:13:50 -04:00
Sudhir Khanger
86a97bf6c3 use 4 spaces instead of indents 2016-04-29 18:42:51 +02:00
Sudhir Khanger
2cc56ebed3 code reformat 2016-04-29 18:42:51 +02:00
Sudhir Khanger
dcbe446607 capitalize first letter of the folder name 2016-04-29 18:42:51 +02:00
Juan Carlos González Cabrero
45abbeb36a Replicate login UI changes for landscape orientation 2016-04-29 12:35:53 +02:00
Juan Carlos González Cabrero
ac41c8f0f4 Remove useless option for colorHint in elements which not need it 2016-04-29 12:35:53 +02:00
Juan Carlos González Cabrero
43121bb313 Added hint color to setup 2016-04-29 12:35:53 +02:00
Juan Carlos González Cabrero
7aa63adbd2 Indent button tag 2016-04-29 12:35:53 +02:00
Juan Carlos González Cabrero
33b03a8b29 Move link of 'new to ownCloud' to the bottom 2016-04-29 12:35:53 +02:00
Juan Carlos González Cabrero
7ab8836394 Update UI for login view according setup config 2016-04-29 12:35:53 +02:00
Juan Carlos González Cabrero
c252313e99 Add new setup variable for text color in login view 2016-04-29 12:35:53 +02:00
jabarros
d387df5ff6 Modify share file layout in order to sort 'Share link' settings 2016-04-28 11:26:06 +02:00
jabarros
aabdcaa04a Changes after CR 2016-04-28 11:26:06 +02:00
jabarros
bf0af8e3a6 Add comments and rename vars 2016-04-28 11:26:06 +02:00
jabarros
93cd2be3bb Change names of share features vars 2016-04-28 11:26:06 +02:00
jabarros
4899d0b851 Update UI to hide sections that are disabled according to setup variables 2016-04-28 11:26:06 +02:00
jabarros
4bdea46b63 Add configuration variables to setup and show or hide share feature on file menu 2016-04-28 11:26:06 +02:00
Jenkins for ownCloud
a73926036f [tx-robot] updated from transifex 2016-04-28 01:34:33 -04:00
Jenkins for ownCloud
58d2754a43 [tx-robot] updated from transifex 2016-04-27 01:13:49 -04:00
Jenkins for ownCloud
f438b9b30d [tx-robot] updated from transifex 2016-04-26 01:16:26 -04:00
Jenkins for ownCloud
0194faa02b [tx-robot] updated from transifex 2016-04-25 01:13:49 -04:00
Jenkins for ownCloud
c72f31ebd3 [tx-robot] updated from transifex 2016-04-24 01:13:35 -04:00
Jenkins for ownCloud
4ccd47009a [tx-robot] updated from transifex 2016-04-23 01:13:48 -04:00
Jenkins for ownCloud
cfd3b940fd [tx-robot] updated from transifex 2016-04-22 01:13:55 -04:00
Juan Carlos González Cabrero
c494290130 Fix string typo 2016-04-21 11:34:38 +02:00
Juan Carlos González Cabrero
3fc331b184 Modify bottom padding on search view 2016-04-21 11:31:48 +02:00
Andy Scherzinger
2eb6303b96 #1581 fixed mini fab order in the fab/speed-dial 2016-04-21 11:31:48 +02:00
David A. Velasco
e43c1d6b3f Improved error handling when copying shared link to clipboard 2016-04-21 11:31:48 +02:00
Jenkins for ownCloud
8c492682d3 [tx-robot] updated from transifex 2016-04-21 01:13:53 -04:00
Jenkins for ownCloud
dd1be14c8d [tx-robot] updated from transifex 2016-04-19 01:13:56 -04:00
Jenkins for ownCloud
e118d3a16c [tx-robot] updated from transifex 2016-04-18 01:13:46 -04:00
Jenkins for ownCloud
27bb85d083 [tx-robot] updated from transifex 2016-04-17 01:13:47 -04:00
Jenkins for ownCloud
127d0045f3 [tx-robot] updated from transifex 2016-04-16 01:13:47 -04:00
Jenkins for ownCloud
2cf77e207f [tx-robot] updated from transifex 2016-04-15 01:13:52 -04:00
David A. Velasco
01cfbdd166 Set dimensions of SamlWebViewDialog to match parent for improved compatibility with adaptive web authenticators 2016-04-14 11:25:25 +02:00
David A. Velasco
68b96ce0db Error dialogs in Uploader updated, both messages and implementation 2016-04-14 09:39:10 +02:00
David A. Velasco
9d005d636f Refatoring, warnings clean-up, improved error logic 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
1b680c606b Update error handling parsing the received uri 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
da6b0c0162 Update dialog for sharing no files to be more intuitive 2016-04-14 09:39:10 +02:00
Jenkins for ownCloud
e21a8cbc6b [tx-robot] updated from transifex 2016-04-14 01:13:50 -04:00
Jenkins for ownCloud
f11111c1b4 [tx-robot] updated from transifex 2016-04-13 01:13:46 -04:00
Jenkins for ownCloud
57115a3461 [tx-robot] updated from transifex 2016-04-12 01:13:47 -04:00
Jenkins for ownCloud
6604265a64 [tx-robot] updated from transifex 2016-04-09 01:13:49 -04:00
Jenkins for ownCloud
06ca5abc6b [tx-robot] updated from transifex 2016-04-07 01:13:49 -04:00
Jenkins for ownCloud
9c2ec9abfd [tx-robot] updated from transifex 2016-04-06 01:13:47 -04:00
Jenkins for ownCloud
b43148fb70 [tx-robot] updated from transifex 2016-04-05 01:13:46 -04:00
Jenkins for ownCloud
c714c7e5ec [tx-robot] updated from transifex 2016-04-03 01:13:33 -04:00
Jenkins for ownCloud
8b53d4fbcb [tx-robot] updated from transifex 2016-04-02 01:14:08 -04:00
Jenkins for ownCloud
844eee84ef [tx-robot] updated from transifex 2016-04-01 01:13:47 -04:00
Jenkins for ownCloud
75ad4e4ce1 [tx-robot] updated from transifex 2016-03-31 01:13:57 -04:00
David A. Velasco
f6ea9b597a Merge branch 'master' into reliable_uploads_actions_uploads_view
Conflicts FIXED in res/values/styles.xml (trivial)
2016-03-30 13:27:09 +02:00
David A. Velasco
9de0ff8cd8 Fixed vertical spacing of cells in uploads view 2016-03-30 11:07:34 +02:00
Jenkins for ownCloud
cdf2269a6e [tx-robot] updated from transifex 2016-03-30 01:13:45 -04:00
Jenkins for ownCloud
a69b0f9511 [tx-robot] updated from transifex 2016-03-29 01:13:50 -04:00
Jenkins for ownCloud
a70e78041e [tx-robot] updated from transifex 2016-03-28 01:13:33 -04:00
Jenkins for ownCloud
ceda2befc0 [tx-robot] updated from transifex 2016-03-27 01:13:35 -04:00
Jenkins for ownCloud
e703afa689 [tx-robot] updated from transifex 2016-03-26 01:13:34 -04:00
Jenkins for ownCloud
afcddf75cd [tx-robot] updated from transifex 2016-03-25 01:13:43 -04:00
Jenkins for ownCloud
aaf53adcfa [tx-robot] updated from transifex 2016-03-24 01:13:42 -04:00
Jenkins for ownCloud
17cff6e24a [tx-robot] updated from transifex 2016-03-23 01:13:47 -04:00
Andy Scherzinger
5feba6a567 code review + fixed alignments 2016-03-22 13:29:23 +01:00
Andy Scherzinger
c96be51151 fixed headline for edit share fragment 2016-03-22 13:29:23 +01:00
Andy Scherzinger
d893654bc1 Fix Headline in share edit and user search 2016-03-22 13:29:23 +01:00
Andy Scherzinger
7fe4de73f3 search view using AppCompat implementation + layout optimizations 2016-03-22 13:29:23 +01:00
Andy Scherzinger
e195cdadd8 redone layouting ans AppCompat switch implementation 2016-03-22 13:29:23 +01:00
Andy Scherzinger
188be20b4d fixed padding for the password dialog 2016-03-22 13:29:23 +01:00
Andy Scherzinger
43a530afcb overall style changes for share edit and search view 2016-03-22 13:29:23 +01:00
Andy Scherzinger
78c53d544e magnify/close icon work 2016-03-22 13:29:23 +01:00
Andy Scherzinger
ab4dd53464 user/group icon work 2016-03-22 13:29:23 +01:00
Jenkins for ownCloud
9bab7df106 [tx-robot] updated from transifex 2016-03-22 01:13:54 -04:00
David A. Velasco
15eb8b493b Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-03-21 17:42:13 +01:00
Juan Carlos González Cabrero
94864bb094 Update strings, comments and removed some conditions 2016-03-21 09:45:27 +01:00
Juan Carlos González Cabrero
55fdcee912 New switch in share via link to allow editing 2016-03-21 09:31:34 +01:00
Jenkins for ownCloud
1c23bcf6f8 [tx-robot] updated from transifex 2016-03-21 01:13:43 -04:00
Jenkins for ownCloud
5363a2ec31 [tx-robot] updated from transifex 2016-03-20 01:13:31 -04:00
Jenkins for ownCloud
350be5afc0 [tx-robot] updated from transifex 2016-03-19 01:13:48 -04:00
Juan Carlos González Cabrero
b1d46eb8ab Change error label for uploads when app is killed 2016-03-18 14:03:33 +01:00
Juan Carlos González Cabrero
f556c5d684 Upload failed strings updated 2016-03-18 10:47:19 +01:00