mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 06:05:42 +03:00
Code Issues Projects Releases Packages Wiki Activity
5896 commits 228 branches 1571 tags 618 MiB
Commit graph

2382 commits

Author SHA1 Message Date
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
Juan Carlos González Cabrero
f150dce25c Refactor clear options for uploads avoiding clear the current ones 2016-03-18 09:22:42 +01:00
Jenkins for ownCloud
5d8e044791 [tx-robot] updated from transifex 2016-03-18 01:54:58 -04:00
David A. Velasco
e181253410 Retrying an upload failed due to wrong credentials checks if stored credentials were already updated before asking to the user 2016-03-17 13:23:25 +01:00
David A. Velasco
772d640bc8 Fixed status message in uploads view 2016-03-16 19:17:01 +01:00
Juan Carlos González Cabrero
a969250b23 Adapt autocompletion to the web UI 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
a7efcf6a2f Add the remote suggestion to the MatrixCursor instead of the JSON array, wich could not parse the path correctly 2016-03-16 13:46:05 +01:00
Jenkins for ownCloud
74434e03e7 [tx-robot] updated from transifex 2016-03-16 01:13:43 -04:00
David A. Velasco
259c94a45b Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-03-15 09:48:12 +01:00
David A. Velasco
09e1f443fc Window brackground color defined indirectly 2016-03-15 08:53:44 +01:00
Jenkins for ownCloud
787adbdc30 [tx-robot] updated from transifex 2016-03-15 01:13:43 -04:00
Andy Scherzinger
0d8f9cdc2e issue #1426 - Background color should be white everywhere 2016-03-14 16:16:59 +01:00
Andy Scherzinger
1df0587ce3 fixed alignment of upload list elements 2016-03-14 16:11:45 +01:00
Jenkins for ownCloud
6241e5712d [tx-robot] updated from transifex 2016-03-12 01:13:44 -05:00
Jenkins for ownCloud
6b00ca7d0d [tx-robot] updated from transifex 2016-03-10 01:13:46 -05:00
Thomas Müller
ea2fe8cb4e Merge pull request #1399 from owncloud/uploadShowsFiles_Master 
Upload shows files
 2016-03-09 13:10:53 +01:00
David A. Velasco
b2c81d3b08 Merge pull request #1100 from owncloud/material_fab 
Material FAB with speed dial implementation
 2016-03-09 08:38:33 +01:00
Jenkins for ownCloud
2b04879c38 [tx-robot] updated from transifex 2016-03-09 01:13:45 -05:00
David A. Velasco
0117123335 Set same color for normal state of FAB and 'primary buttons' 2016-03-08 17:11:59 +01:00
David A. Velasco
ec9b705536 Wording and padding fixes in uploads list 2016-03-08 13:17:55 +01:00
Jenkins for ownCloud
1fb4ccf85b [tx-robot] updated from transifex 2016-03-08 01:13:42 -05:00
Jenkins for ownCloud
47cff3c5c9 [tx-robot] updated from transifex 2016-03-07 01:13:41 -05:00
Jenkins for ownCloud
ee28eae263 [tx-robot] updated from transifex 2016-03-05 01:13:47 -05:00
David A. Velasco
beb10a91cd Uploads over settings in navigation drawer 2016-03-03 13:00:32 +01:00
Andy Scherzinger
6c83af4521 using color_accent instead of internal owncloud color reference 2016-03-02 11:36:45 +01:00
Jenkins for ownCloud
624c40685a [tx-robot] updated from transifex 2016-03-02 01:13:47 -05:00
Andy Scherzinger
2d0fc03ef0 remove divider according to #1428 2016-03-01 15:37:32 +01:00
Jenkins for ownCloud
1af1a4d0b6 [tx-robot] updated from transifex 2016-03-01 01:13:44 -05:00
Jenkins for ownCloud
872a2509e4 [tx-robot] updated from transifex 2016-02-29 01:13:33 -05:00
Jenkins for ownCloud
4d40ab45a7 [tx-robot] updated from transifex 2016-02-28 01:13:36 -05:00
Jenkins for ownCloud
3d32c36e07 [tx-robot] updated from transifex 2016-02-27 01:13:44 -05:00
masensio
573d94453b Delete context menu in UploadListFragment 2016-02-26 14:34:41 +01:00
masensio
8006c893f9 Clean code, from uploads view implementation 2016-02-26 14:15:42 +01:00
Jenkins for ownCloud
9a6e371368 [tx-robot] updated from transifex 2016-02-26 01:13:46 -05:00
Bartosz Przybylski
b6b830e722 Revert incorrect merge decision 2016-02-25 18:24:56 +01:00
Andy Scherzinger
8bf7c22ad7 fix for scrolling beyond the fab see #1346 2016-02-25 18:15:01 +01:00
Andy Scherzinger
5e9bf598f3 force all menu items into the overflow menu (see discussion https://github.com/owncloud/android/issues/1232#issuecomment-153075076) 2016-02-25 18:15:00 +01:00
Andy Scherzinger
d4ce0d920f hide FAB in copy/move folder chooser 2016-02-25 18:07:49 +01:00
Andy Scherzinger
8d23bdcf9f added accents color definition on missed out top level theme definitions. 2016-02-25 18:07:42 +01:00
Andy Scherzinger
3d7985b084 minor refresh button fixes 2016-02-25 18:07:42 +01:00
Andy Scherzinger
be421ce04d don't show labels all the time just during the first usage and application lifecycle. When the app is restarted the labels then won't show again. 2016-02-25 18:07:42 +01:00
Andy Scherzinger
d7ff626db3 added sorting icon from material, spring cleaning in lower resolution icons and obsolete Android versions 2016-02-25 18:07:29 +01:00
Andy Scherzinger
e8c64ebf8d initial implementaion for click events + using the import icon for upload from other apps, also fixed the checkboxes for hdpi/mdpi 2016-02-25 18:07:28 +01:00
Andy Scherzinger
b1dd299cdb coloer changes for #1132 2016-02-25 18:07:11 +01:00
Andy Scherzinger
e0bacfaaea initial implementation of the FAB with Speed Dial 2016-02-25 18:07:11 +01:00
Juan Carlos González Cabrero
a506014d58 Checking of local file when an upload retry is requested 2016-02-24 10:41:50 +01:00
David A. Velasco
d2940f6214 Used OC trashbin icon in uploads view 2016-02-24 10:11:54 +01:00
Jenkins for ownCloud
674095a911 [tx-robot] updated from transifex 2016-02-24 01:13:33 -05:00
Jenkins for ownCloud
4b20242ee7 [tx-robot] updated from transifex 2016-02-23 01:13:44 -05:00
Juan Carlos González Cabrero
87076468da New resolution for ic_cancel icon 2016-02-22 14:09:56 +01:00
David A. Velasco
286dc8fafd Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-02-22 10:21:46 +01:00
Jenkins for ownCloud
c2bb832547 [tx-robot] updated from transifex 2016-02-22 01:13:33 -05:00
Jenkins for ownCloud
2adeab1fc5 [tx-robot] updated from transifex 2016-02-21 01:13:32 -05:00
Jenkins for ownCloud
6009ef939b [tx-robot] updated from transifex 2016-02-20 01:13:39 -05:00
Maria Asensio
482d43a08d Merge pull request #1473 from owncloud/target_marshmallow_rebased 
Move to compile target Marshmallow (Android 6 - v23) - rebased without FAB
 2016-02-19 11:28:05 +01:00
Jenkins for ownCloud
5828ec35b8 [tx-robot] updated from transifex 2016-02-19 01:13:36 -05:00
Jenkins for ownCloud
79c7cc86bc [tx-robot] updated from transifex 2016-02-18 01:13:43 -05:00
Jenkins for ownCloud
e12734c551 [tx-robot] updated from transifex 2016-02-17 01:13:47 -05:00
Jenkins for ownCloud
e219eebaa0 [tx-robot] updated from transifex 2016-02-16 01:13:36 -05:00
Andy Scherzinger
3fa2d292bb fixed ic_refresh icon work with 24dp origial grey600 version 2016-02-15 17:34:45 +01:00
David A. Velasco
82b0b7a84f Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-02-15 14:59:04 +01:00
Juan Carlos González Cabrero
9fe62d15ea Refresh listview when clear failed/finished uploads clicked 2016-02-15 10:58:53 +01:00
Jenkins for ownCloud
5f15321445 [tx-robot] updated from transifex 2016-02-15 01:13:39 -05:00
Jenkins for ownCloud
d31c2ada3b [tx-robot] updated from transifex 2016-02-14 01:13:33 -05:00
Jenkins for ownCloud
5800ab977e [tx-robot] updated from transifex 2016-02-13 01:13:37 -05:00
Andy Scherzinger
bc4de91e93 material style play icon added 2016-02-12 12:50:00 +01:00
Andy Scherzinger
9d9bc6958b changes color of the OK button and the text 2016-02-12 12:29:05 +01:00
Andy Scherzinger
cbf134a6e2 move strings to resource file 2016-02-12 12:29:05 +01:00
Jenkins for ownCloud
dfb8df1201 [tx-robot] updated from transifex 2016-02-12 01:13:35 -05:00
Jenkins for ownCloud
986b2c7b2b [tx-robot] updated from transifex 2016-02-11 01:13:41 -05:00
David A. Velasco
7366dbff09 Update branch master with released code for version 1.9.1 2016-02-10 11:35:07 +01:00
Jenkins for ownCloud
e224125ae0 [tx-robot] updated from transifex 2016-02-10 01:13:36 -05:00
David A. Velasco
3885db5013 Positive button of remove dialog(s) changed to 'Yes' 2016-02-09 08:59:35 +01:00
Jenkins for ownCloud
62b13a6be9 [tx-robot] updated from transifex 2016-02-09 01:13:38 -05:00
Jenkins for ownCloud
f52e182971 [tx-robot] updated from transifex 2016-02-08 01:13:30 -05:00
Jenkins for ownCloud
27bcedfc72 [tx-robot] updated from transifex 2016-02-07 01:13:37 -05:00
Jenkins for ownCloud
35286be480 [tx-robot] updated from transifex 2016-02-06 01:13:35 -05:00
Jenkins for ownCloud
ff9862badd [tx-robot] updated from transifex 2016-02-05 01:13:37 -05:00
David A. Velasco
6eca835d1d Renamed scaring 'delete account' to 'remove account' 2016-02-04 14:51:54 +01:00
David A. Velasco
008153a541 Changed text color of secondary buttons to black 2016-02-04 14:51:54 +01:00
David A. Velasco
7931c321f2 Merge pull request #1461 from owncloud/manage_space_activity 
Added own Activity to manage space instead of default "Clear data" button in device settings
 2016-02-04 14:50:53 +01:00
Jenkins for ownCloud
9bfaaf3b8b [tx-robot] updated from transifex 2016-02-04 01:13:37 -05:00
David A. Velasco
a827cfa791 Merge pull request #1314 from owncloud/prefDetails 
Renamed "security" category to "details" in app settings, for further use
 2016-02-03 17:51:13 +01:00
masensio
9fd38ca0dd Changes from comments in Code Review: staring and NPE 2016-02-03 16:03:10 +01:00
masensio
dc2fdb9744 Changes from comments in Code Review: Strings and minor things 2016-02-03 14:28:12 +01:00
masensio
14530aa7b8 Changes from comments in PR Code Review 2016-02-03 13:45:53 +01:00
masensio
3d623ca911 Review string manage_space_description 2016-02-03 13:37:47 +01:00
masensio
96ce49707b Clean app data (keeping the PASSCODE untouched) from ManageSpaceActivity 2016-02-03 13:37:45 +01:00
masensio
d6653ef684 Add android:manageSpaceActivity to AndroidManifest.xml. Create empty activity ManageSpaceActivity.java 2016-02-03 13:37:43 +01:00
Jenkins for ownCloud
c8dcf8b7ac [tx-robot] updated from transifex 2016-02-03 01:13:37 -05:00
tobiasKaminsky
da0d98629c Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles_Master 2016-02-02 21:05:16 +01:00
tobiasKaminsky
5b7f44e0f7 renamed security category to details for further use 
moved position
 2016-02-02 17:45:01 +01:00
David A. Velasco
9761b34c76 Merge pull request #1439 from owncloud/wording-fixes 
Wording fixes, simplify some strings and fix capitalization
 2016-02-02 17:33:25 +01:00
Jenkins for ownCloud
9c18126bf0 [tx-robot] updated from transifex 2016-02-02 01:13:41 -05:00
Jenkins for ownCloud
3951b2db95 [tx-robot] updated from transifex 2016-02-01 01:13:31 -05:00
Jenkins for ownCloud
73d327a407 [tx-robot] updated from transifex 2016-01-31 01:13:30 -05:00
Jenkins for ownCloud
52d043be21 [tx-robot] updated from transifex 2016-01-30 01:13:40 -05:00
Jenkins for ownCloud
2795750c55 [tx-robot] updated from transifex 2016-01-29 01:13:33 -05:00
Jenkins for ownCloud
8bf14931b0 [tx-robot] updated from transifex 2016-01-28 01:13:39 -05:00
masensio
9c57aafab5 Review appereance of Uploads View 2016-01-27 13:59:51 +01:00
Maria Asensio
2e074864a2 Merge pull request #1451 from owncloud/share__edit_privileges 
Share  edit privileges
 2016-01-27 11:28:16 +01:00
masensio
44f2894731 Checking Uploads with the same name 2016-01-26 17:53:13 +01:00
masensio
2f231561af Checking Priviledges Error failed uploads 2016-01-25 15:20:50 +01:00
masensio
29cb1277c3 Checking File Error failed uploads 2016-01-25 14:54:31 +01:00
masensio
15d5350ef6 Checking Folder Error failed uploads 2016-01-25 14:23:23 +01:00
masensio
198c1bf3b0 Checking Credential Error failed uploads: show error as Credential error and relogin 2016-01-25 13:02:22 +01:00
masensio
b6f8e93504 Checking Network Connection failed uploads 2016-01-25 10:59:53 +01:00
Jenkins for ownCloud
f1fcab8e18 [tx-robot] updated from transifex 2016-01-24 01:13:30 -05:00
Jenkins for ownCloud
2818c41641 [tx-robot] updated from transifex 2016-01-23 01:13:36 -05:00
Jenkins for ownCloud
6a72d01d0e [tx-robot] updated from transifex 2016-01-22 01:13:32 -05:00
masensio
f11646bc6e Review ic_refresh dimensions 2016-01-21 09:29:58 +01:00
Jenkins for ownCloud
e909f8b625 [tx-robot] updated from transifex 2016-01-21 01:13:38 -05:00
masensio
814a70f6a3 Update refresh icon in uploads view 2016-01-20 18:41:52 +01:00
David A. Velasco
628e713268 Update model changed: permission updates are requested to the server as soon as the user changes any value 2016-01-20 18:18:14 +01:00
masensio
b353ed62cd Show thumbnail or file icon depending on the file type in Uploads view 2016-01-20 18:06:35 +01:00
David A. Velasco
0d4c9b9961 Show error message from server when update of permissions fail 2016-01-20 12:22:24 +01:00
masensio
2c4daf3a93 Update the status of current upload when it finishes 2016-01-20 11:19:43 +01:00
Jenkins for ownCloud
e3d882b386 [tx-robot] updated from transifex 2016-01-20 01:13:33 -05:00
masensio
6f58527273 Update progress bar for Current Upload 2016-01-19 17:32:50 +01:00
Jenkins for ownCloud
9c59c5fb4c [tx-robot] updated from transifex 2016-01-19 01:13:40 -05:00
Jan-Christoph Borchardt
61a1d97abc wording fixes, simplify some strings and fix capitalization 2016-01-18 15:10:50 +01:00
Jenkins for ownCloud
98229db831 [tx-robot] updated from transifex 2016-01-18 01:13:31 -05:00
Jenkins for ownCloud
a5aa573594 [tx-robot] updated from transifex 2016-01-17 01:13:33 -05:00
Jenkins for ownCloud
81494e6246 [tx-robot] updated from transifex 2016-01-15 01:13:37 -05:00
Jenkins for ownCloud
13f8ed9d39 [tx-robot] updated from transifex 2016-01-14 01:13:41 -05:00
David A. Velasco
81b8918939 Fixed color of 'stop sharing' button in Android 4.x 2016-01-13 14:23:50 +01:00
David A. Velasco
e4078a5734 Added scroll to permissions editor to grant usability in landscape 2016-01-13 13:43:07 +01:00
Jenkins for ownCloud
6165134f60 [tx-robot] updated from transifex 2016-01-13 01:13:43 -05:00
masensio
990f16ca47 Add drawe access from uploads view 2016-01-12 14:16:22 +01:00
David A. Velasco
e7901656a1 Polish UI to edit permissions 2016-01-11 15:34:41 +01:00
David A. Velasco
d826451e2d Added buttons to unshare (working) and finish (not working) in EditShareFragment layout 2016-01-11 12:17:11 +01:00
David A. Velasco
5fcb70beee Added fragment to edit share permissions with basic layout 2016-01-11 12:17:08 +01:00
Jenkins for ownCloud
d8dca7243d [tx-robot] updated from transifex 2016-01-11 01:13:42 -05:00
tobiasKaminsky
021fe9d14b changes according to CR 2016-01-10 20:17:21 +01:00
Jenkins for ownCloud
233a881765 [tx-robot] updated from transifex 2016-01-10 01:13:46 -05:00
Jenkins for ownCloud
c371aa5b00 [tx-robot] updated from transifex 2016-01-09 01:13:44 -05:00
masensio
2181239c6d Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-01-08 11:21:23 +01:00
Maria Asensio
ab7b3c09c3 Merge pull request #1099 from owncloud/switchListVsGrid 
Switch list vs grid
 2016-01-08 10:18:00 +01:00
Jenkins for ownCloud
f97d57283b [tx-robot] updated from transifex 2016-01-08 01:13:42 -05:00
Jenkins for ownCloud
73b58324a8 [tx-robot] updated from transifex 2016-01-07 01:13:44 -05:00
Jenkins for ownCloud
804be08c1b [tx-robot] updated from transifex 2016-01-06 01:13:42 -05:00
David A. Velasco
d26da3cbc2 Recovered changes lost in complex rebase 2016-01-05 12:12:18 +01:00
tobiasKaminsky
d7e9ef92b8 fixed according to review 2016-01-05 11:50:00 +01:00
tobiasKaminsky
2586298380 moved switch menu item to three dots menu 2016-01-05 11:21:37 +01:00
tobiasKaminsky
6bd7065c73 wip 2016-01-05 11:16:00 +01:00
Jenkins for ownCloud
1fbcd81bd4 [tx-robot] updated from transifex 2016-01-05 01:13:48 -05:00
Jenkins for ownCloud
bc9a890b6f [tx-robot] updated from transifex 2016-01-04 01:13:42 -05:00
Jenkins for ownCloud
d75f615031 [tx-robot] updated from transifex 2016-01-01 01:13:43 -05:00
tobiasKaminsky
b2ae3fa467 Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles 2015-12-31 13:26:36 +01:00
masensio
540d123ad5 Merge branch 'master' into reliable_uploads_actions_uploads_view 2015-12-29 12:46:45 +01:00
Andy Scherzinger
a812784ddd Merge branch 'master' of https://github.com/owncloud/android into material_buttons 
Conflicts (resolved):
	res/layout/drawer.xml
	res/values/colors.xml
	res/values/setup.xml
 2015-12-28 20:03:25 +01:00
Maria Asensio
9954f71408 Merge pull request #1351 from owncloud/Update_of_brandable_colors 
Added colors for header of navigation drawer and login button to the …
 2015-12-28 14:17:05 +01:00
masensio
eee7ea369d Merge branch 'master' into reliable_uploads_actions_uploads_view 2015-12-28 10:13:38 +01:00
Jenkins for ownCloud
ca03f14752 [tx-robot] updated from transifex 2015-12-28 01:13:40 -05:00
Jenkins for ownCloud
f137759e6b [tx-robot] updated from transifex 2015-12-25 01:13:46 -05:00
Jenkins for ownCloud
30a4201b33 [tx-robot] updated from transifex 2015-12-23 01:45:19 -05:00
David A. Velasco
bd1f6452ac Make button colours easy to brand 2015-12-22 17:22:24 +01:00
Jenkins for ownCloud
3182a9e00f [tx-robot] updated from transifex 2015-12-19 01:13:41 -05:00
David A. Velasco
dee7c33235 Added style to buttons in share_file_layout and centered refresh button in account_setup 2015-12-17 16:58:47 +01:00
David A. Velasco
d5c4d7ab92 Changes from code review 2015-12-17 15:49:55 +01:00
Jenkins for ownCloud
669ebe083c [tx-robot] updated from transifex 2015-12-17 01:13:44 -05:00
David A. Velasco
147e6989c8 Added colors for header of navigation drawer and login button to the list of brandable colors 2015-12-14 12:50:52 +01:00
Jenkins for ownCloud
dadf31f522 [tx-robot] updated from transifex 2015-12-13 01:13:30 -05:00
Jenkins for ownCloud
27bc03b6de [tx-robot] updated from transifex 2015-12-12 01:13:40 -05:00
masensio
ade956dd7b Merge branch 'master' into reliable_uploads_actions_uploads_view 2015-12-11 09:50:36 +01:00
masensio
a840e67a68 Add 'Uploads' option into NavigationDrawer 2015-12-11 08:43:33 +01:00
Jenkins for ownCloud
8855855a52 [tx-robot] updated from transifex 2015-12-11 01:13:40 -05:00
masensio
a2b680edd0 Merge branch 'reliable_uploads' into reliable_uploads_actions_uploads_view 2015-12-10 17:35:32 +01:00
masensio
dc0aea30f0 Merge branch 'master' into reliable_uploads 
Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/db/ProviderMeta.java
	src/com/owncloud/android/files/FileMenuFilter.java
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/utils/FileStorageUtils.java
 2015-12-10 17:18:52 +01:00
Jenkins for ownCloud
3e25c84863 [tx-robot] updated from transifex 2015-12-10 01:13:44 -05:00
Andy Scherzinger
71e87d98a8 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-12-09 15:14:22 +01:00
Maria Asensio
896e4859c0 Merge pull request #1168 from owncloud/avoidDuplicateFiles 
Avoid duplicate files
 2015-12-09 09:27:54 +01:00
Jenkins for ownCloud
2f7690879a [tx-robot] updated from transifex 2015-12-08 01:13:37 -05:00
Jenkins for ownCloud
d696f10e06 [tx-robot] updated from transifex 2015-12-07 01:13:29 -05:00
Jenkins for ownCloud
106a2324e1 [tx-robot] updated from transifex 2015-12-06 01:13:29 -05:00
Jenkins for ownCloud
2e9c4ed217 [tx-robot] updated from transifex 2015-12-05 01:13:42 -05:00
Jenkins for ownCloud
d44f2a3a10 [tx-robot] updated from transifex 2015-12-04 01:13:39 -05:00
masensio
59442c80ea Update string 2015-12-03 12:58:22 +01:00
Jenkins for ownCloud
db2256765d [tx-robot] updated from transifex 2015-12-03 01:13:40 -05:00
Jenkins for ownCloud
872e32475b [tx-robot] updated from transifex 2015-12-02 01:13:53 -05:00
tobiasKaminsky
04fc2e3cc2 changed according to latest discussion 2015-12-01 22:00:53 +01:00
Jenkins for ownCloud
eb5a24d25c [tx-robot] updated from transifex 2015-12-01 01:13:42 -05:00
Jenkins for ownCloud
6f04c58f59 [tx-robot] updated from transifex 2015-11-30 01:13:52 -05:00
Jenkins for ownCloud
82fd5e47e2 [tx-robot] updated from transifex 2015-11-29 01:13:42 -05:00
Jenkins for ownCloud
248aaf4bf0 [tx-robot] updated from transifex 2015-11-28 01:13:42 -05:00
Jenkins for ownCloud
c173743870 [tx-robot] updated from transifex 2015-11-27 01:13:44 -05:00
Jenkins for ownCloud
70f59f6ad9 [tx-robot] updated from transifex 2015-11-26 01:13:44 -05:00
David A. Velasco
f5369ac4b2 Hide UI elements about public share when this is disabled in the server 2015-11-25 09:32:31 +01:00
masensio
3087a3af3e Review padding values for expiration date and password rows in share view 2015-11-25 09:32:28 +01:00
masensio
030eaffcfc List view is shown completelly on the ShareFileFragment 2015-11-25 09:32:27 +01:00
masensio
e08513a762 Delete any rest of old public share/unshare flow 2015-11-25 09:32:26 +01:00
David A. Velasco
729a9b7c77 Set or clear password to protect public link in ShareFileFragment 2015-11-25 09:32:19 +01:00
David A. Velasco
f1b3208f1a Updated ShareFileFragment layout with extra section for public shares 2015-11-25 09:32:15 +01:00
David A. Velasco
a39c857680 Removed unneeded FrameLayout 2015-11-25 09:32:14 +01:00
Jenkins for ownCloud
d60023867c [tx-robot] updated from transifex 2015-11-25 01:13:40 -05:00
Jenkins for ownCloud
83e2bd588d [tx-robot] updated from transifex 2015-11-24 01:13:40 -05:00
Jenkins for ownCloud
d244d558e3 [tx-robot] updated from transifex 2015-11-23 01:13:32 -05:00
Andy Scherzinger
ecdb95fa0c Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-11-22 17:10:37 +01:00
Jenkins for ownCloud
bbfa65cba6 [tx-robot] updated from transifex 2015-11-22 01:13:39 -05:00
tobiasKaminsky
2aac1e5270 Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master 2015-11-21 08:48:40 +01:00
Jenkins for ownCloud
f8f99af255 [tx-robot] updated from transifex 2015-11-21 01:13:37 -05:00
Jenkins for ownCloud
76bfd8d452 [tx-robot] updated from transifex 2015-11-20 01:13:34 -05:00
Jenkins for ownCloud
05232de750 [tx-robot] updated from transifex 2015-11-19 01:13:47 -05:00
Jenkins for ownCloud
8331456825 [tx-robot] updated from transifex 2015-11-13 01:13:44 -05:00
Jenkins for ownCloud
adfe21b886 [tx-robot] updated from transifex 2015-11-11 01:13:45 -05:00
Jenkins for ownCloud
c229790208 [tx-robot] updated from transifex 2015-11-10 01:13:45 -05:00
Jenkins for ownCloud
c386801013 [tx-robot] updated from transifex 2015-11-09 01:13:41 -05:00
Jenkins for ownCloud
11be7f0f54 [tx-robot] updated from transifex 2015-11-08 01:13:44 -05:00
Jenkins for ownCloud
48b35330f1 [tx-robot] updated from transifex 2015-11-07 01:13:50 -05:00
Andy Scherzinger
c31f602fd1 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 
Conflicts:
	res/layout/list_item.xml
 2015-11-06 11:38:51 +01:00
Maria Asensio
19cce9c90f Merge pull request #1184 from Wikinaut/show-certificate-digest 
fix #1024 show cert fingerprints when adding new account w/ untrusted certificate
 2015-11-06 11:23:30 +01:00
Jenkins for ownCloud
bf53dfb3af [tx-robot] updated from transifex 2015-11-06 01:14:02 -05:00
Maria Asensio
7e96305668 Merge pull request #1252 from owncloud/share_with_users 
Share with users & groups
 2015-11-05 13:19:24 +01:00
David A. Velasco
b985935f22 Removed spurious file 2015-11-05 10:24:38 +01:00
Jenkins for ownCloud
94b21ef5d9 [tx-robot] updated from transifex 2015-11-05 01:13:44 -05:00
Andy Scherzinger
f7fe0e00de moved back to #eee for the divider coloring since the coloring hasn't worked yet for the standard list views, see discussion #1232 2015-11-04 10:51:43 +01:00
Jenkins for ownCloud
62287458b8 [tx-robot] updated from transifex 2015-11-04 01:13:47 -05:00
Jenkins for ownCloud
653a812684 [tx-robot] updated from transifex 2015-11-03 01:13:49 -05:00
Andy Scherzinger
2cfc7237ea correct text field names 2015-11-02 15:26:00 +01:00
Andy Scherzinger
838aaff224 change devider color to #f8f8f8 2015-11-02 15:25:43 +01:00
Andy Scherzinger
90097b107d typos fixed 2015-11-02 12:22:49 +01:00
Andy Scherzinger
efdcb97963 setting divider color to #eee as decided by @jancborchardt 2015-11-02 12:05:52 +01:00
Andy Scherzinger
f72289f7bf Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-11-02 08:41:51 +01:00
Andy Scherzinger
6e54dfc55c flipped size and mod date 2015-11-02 08:40:18 +01:00
Jenkins for ownCloud
2f237fb0cc [tx-robot] updated from transifex 2015-11-02 01:13:44 -05:00
Jenkins for ownCloud
f817e49515 [tx-robot] updated from transifex 2015-11-01 01:13:47 -04:00
Jenkins for ownCloud
bba2964726 [tx-robot] updated from transifex 2015-10-31 01:13:54 -04:00
masensio
f1bd33ce00 Fix: Having the device in landscape current shared users are not shown. Redimension 'Share with' dialog 2015-10-30 16:53:06 +01:00
masensio
d1294ca584 Good behaviiour in servers not supporting SHAREE API: show the menu option and a messsage when try to share with a new user/group 2015-10-30 16:50:49 +01:00
masensio
f8548b49f1 Delete search_user_item.xml 2015-10-30 16:48:33 +01:00
masensio
671fef617b Show users/groups in Search Fragment list 2015-10-30 16:48:31 +01:00
masensio
b3dc5f477c Show 'Add Users or Groups' button properly 2015-10-30 16:47:31 +01:00
David A. Velasco
33a9d1f447 Get rid of dependency on Context in CreateShareOperation 2015-10-30 16:41:59 +01:00
masensio
fcdef568ea Remove share_group_indicator string 2015-10-30 16:39:23 +01:00
masensio
ceffbc4aa8 Remove unshare with users/groups option from the menu 2015-10-30 16:39:21 +01:00
David A. Velasco
305536f8c2 Users and groups retrieved from server to fill search suggestions 2015-10-30 16:31:08 +01:00
masensio
1fbc44b574 Add new string for share_groups_indicator 2015-10-30 16:28:41 +01:00
masensio
fff362d103 Add unshare with user option to share with view 2015-10-30 16:28:37 +01:00
David A. Velasco
e3d509a451 Complete search widget to send search requests to parent activity 2015-10-30 16:28:35 +01:00
masensio
20b0ec8977 Show users/groups in share with view, getting the data from the server 2015-10-30 16:26:26 +01:00
masensio
88eca70dbf fix Travis 2015-10-30 16:25:55 +01:00
masensio
00a221ea8f Remove android.support.widget components from the sharewith view. Waiting for introducing Floating button in the project 2015-10-30 16:25:54 +01:00
David A. Velasco
0db4fc9b17 Sync user and group shares into database 2015-10-30 16:25:52 +01:00
masensio
905b68b4ec Show the 'search' layout in phone and tablet 2015-10-30 15:23:03 +01:00
David A. Velasco
bc5687b74a Changed title in sharing dialog from 'Share link' to 'Sharing' (seen in web UI) 2015-10-30 15:23:00 +01:00
masensio
2855a81cf0 Create the layout for searching users/groups 2015-10-30 15:22:58 +01:00
masensio
c6c5b732c7 Add get list of users in the library 2015-10-30 15:22:12 +01:00
masensio
f28faf0c26 Show the layout to hsare with user in phone and tablet 2015-10-30 15:21:48 +01:00
masensio
8e3d7bdc8f Create the layout to share with a user 2015-10-30 15:10:42 +01:00
masensio
3a527a8fe4 Add 'Share with users/groups' to long press menu 2015-10-30 15:04:34 +01:00
Maria Asensio
eaa0612bfa Merge pull request #1109 from owncloud/sync_full_folder 
Replaced 'download folder' with 'synchronize', triggering the synchronization in two-ways of all the files in a folder
 2015-10-30 14:14:52 +01:00
Jenkins for ownCloud
720c49136a [tx-robot] updated from transifex 2015-10-30 01:13:47 -04:00
Jenkins for ownCloud
00c6d8bffe [tx-robot] updated from transifex 2015-10-29 01:13:42 -04:00
masensio
b9ef747a0b Merge branch 'master' into sync_full_folder 
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/files/services/FileUploader.java
 2015-10-27 08:52:17 +01:00
Jenkins for ownCloud
3918ec18a8 [tx-robot] updated from transifex 2015-10-27 01:13:47 -04:00
Andy Scherzinger
2603a35105 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-10-26 13:57:04 +01:00
Jenkins for ownCloud
2702951056 [tx-robot] updated from transifex 2015-10-23 01:13:41 -04:00
Andy Scherzinger
5c1e6e59ba Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-10-22 13:05:06 +02:00
David A. Velasco
08443f90c5 Merge pull request #1177 from owncloud/notification_coloring 
Add ownCloud color to notifications for lollipop
 2015-10-22 09:10:10 +02:00
Andy Scherzinger
dffd81e00c removed primary color usage for textColor of the input fields on the loginscreen 2015-10-21 11:31:58 +02:00
Andy Scherzinger
e61641b39d center align radio buttons 2015-10-21 11:05:11 +02:00
Jenkins for ownCloud
8269b6dee6 [tx-robot] updated from transifex 2015-10-21 01:13:40 -04:00
Jenkins for ownCloud
1db483d521 [tx-robot] updated from transifex 2015-10-20 01:13:41 -04:00
Andy Scherzinger
d64946f859 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-10-19 13:00:15 +02:00
Jenkins for ownCloud
d1dfc9958d [tx-robot] updated from transifex 2015-10-19 01:13:44 -04:00
tobiasKaminsky
e92297ccaf split "on charging" to photo and video 2015-10-18 12:51:08 +02:00
tobiasKaminsky
e5caabd104 Merge remote-tracking branch 'remotes/upstream/master' into uploadWhenCharging 2015-10-18 12:50:54 +02:00
tobiasKaminsky
1db620124a update according to jan 2015-10-18 10:21:29 +02:00
tobiasKaminsky
7fe9c02bff Merge branch 'uploadWhenCharging' of github.com:owncloud/android into uploadWhenCharging 2015-10-18 10:08:46 +02:00
Jenkins for ownCloud
47e74b6271 [tx-robot] updated from transifex 2015-10-18 01:13:42 -04:00
Jenkins for ownCloud
185b670e5c [tx-robot] updated from transifex 2015-10-17 01:13:48 -04:00
tobiasKaminsky
e18773465d Merge remote-tracking branch 'remotes/upstream/master' into uploadShowsFiles 2015-10-15 18:27:07 +02:00
Andy Scherzinger
c56b3568c5 Merge branch 'master' of https://github.com/owncloud/android into notification_coloring 2015-10-14 10:34:48 +02:00
Andy Scherzinger
2610eb6805 Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-10-14 10:33:49 +02:00
Jenkins for ownCloud
c47b0ab77a [tx-robot] updated from transifex 2015-10-14 01:13:38 -04:00
Jenkins for ownCloud
28198ee983 [tx-robot] updated from transifex 2015-10-13 01:13:37 -04:00
Jenkins for ownCloud
a317483f44 [tx-robot] updated from transifex 2015-10-12 01:13:37 -04:00
Andy Scherzinger
e5a61893ec Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-10-11 12:30:05 +02:00
Jenkins for ownCloud
42f38fe876 [tx-robot] updated from transifex 2015-10-11 01:13:36 -04:00
Jenkins for ownCloud
f206eaaeb4 [tx-robot] updated from transifex 2015-10-10 01:13:37 -04:00
Andy Scherzinger
a61f862677 directly link owncloud_blue color ID to setup.xml's actionbar_start_color to enable proper color manipulation. Technical debt: setup should rename the actionbar_start_color (and actionbar_end_color) since it is basically the primary-oiiod value due to material design terms. 2015-10-09 15:04:39 +02:00
Jenkins for ownCloud
f9b7cbd2d5 [tx-robot] updated from transifex 2015-10-09 01:13:37 -04:00
Andy Scherzinger
41a883549f Merge branch 'master' of https://github.com/owncloud/android into material_buttons 2015-10-07 19:03:23 +02:00