mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-29 21:59:47 +03:00
Code Issues Projects Releases Packages Wiki Activity
7822 commits 233 branches 1574 tags 574 MiB
Commit graph

7822 commits

This branch
This branch
All branches
Author SHA1 Message Date
tobiasKaminsky
a07f0dc821
Merge remote-tracking branch 'origin/userTheming' into userTheming 
# Conflicts:
#	src/main/java/com/owncloud/android/utils/DisplayUtils.java
 2017-06-13 09:49:26 +02:00
tobiasKaminsky
b5643f90a2
color toolbar & progress bar 2017-06-13 09:48:22 +02:00
AndyScherzinger
d8d8d0692a
calculate Text Color 2017-06-13 09:41:02 +02:00
AndyScherzinger
608bf30764
calculateLuminance function 2017-06-13 09:37:22 +02:00
tobiasKaminsky
2ed50a3317
use solid color if a hex color is provided instead of an url in user info activity 2017-06-13 09:02:05 +02:00
nextcloud-android-bot
18c6f06ffc Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-06-13 07:00:14 +00:00
Tobias Kaminsky
d20375800a Merge 26505cf7a8 into dada6c6803 2017-06-13 06:47:29 +00:00
Tobias Kaminsky
dada6c6803 Create lint-results.txt 
Manually changed warning count
 2017-06-13 08:47:24 +02:00
tobiasKaminsky
cc32bd28fb
FAB color 2017-06-13 08:41:03 +02:00
tobiasKaminsky
26505cf7a8
use correct exit code 2017-06-13 08:02:35 +02:00
tobiasKaminsky
aeee5599d0
use solid color if a hex color is provided instead of an url 2017-06-12 15:04:42 +02:00
tobiasKaminsky
03f5022104
preserve aspect ratio in user info activity 2017-06-12 14:31:07 +02:00
tobiasKaminsky
2bcff533b9
use server slogan on every occurrence 2017-06-12 14:30:33 +02:00
tobiasKaminsky
2eaecb41b5
Merge remote-tracking branch 'origin/userTheming' into userTheming 2017-06-12 13:47:07 +02:00
Nextcloud bot
6c76c26bc1
[tx-robot] updated from transifex 2017-06-12 00:25:59 +00:00
Mario Đanić
535e5d1ec3 Merge pull request #1073 from imjarp/logoffRemoveUploads 
Removing uploads from account when logout
 2017-06-08 04:37:02 +02:00
Nextcloud bot
6ee38c739b
[tx-robot] updated from transifex 2017-06-08 00:27:39 +00:00
JARP
7d3da12b7c codacy suggestions 2017-06-07 15:54:17 -05:00
AndyScherzinger
a9fa536fb3
Merge branch 'master' of https://github.com/nextcloud/android into pinchZoom 2017-06-07 22:33:59 +02:00
JARP
f7ce3e9ab5 Removing uploads from account 2017-06-07 15:27:03 -05:00
tobiasKaminsky
f951c199ef
partially color primary and primary_dark working 2017-06-07 09:33:12 +02:00
tobiasKaminsky
fdfc4951e8
use server slogan if present when browsing root folder 2017-06-07 09:33:12 +02:00
tobiasKaminsky
a557c26d50
use background image also an user info 2017-06-07 09:33:12 +02:00
tobiasKaminsky
2b5507592f
change progress color 2017-06-07 09:33:11 +02:00
tobiasKaminsky
d84c13a176
use background image from theming app in drawer 2017-06-07 09:33:11 +02:00
tobiasKaminsky
b72d900d7d
add server name & color 2017-06-07 09:33:11 +02:00
Mario Đanić
24464951dc Merge pull request #1072 from nextcloud/fixTitleBar 
Fixing title bar
 2017-06-07 08:49:09 +02:00
alejandro
9043685c18 Fixing title bar 2017-06-07 08:39:08 +02:00
Nextcloud bot
a25f953b6e
[tx-robot] updated from transifex 2017-06-07 00:29:26 +00:00
AndyScherzinger
bb7c065b1e
Merge branch 'master' of https://github.com/nextcloud/android into pinchZoom 2017-06-06 17:32:00 +02:00
Andy Scherzinger
35403deda8 Merge pull request #1071 from nextcloud/customizations 
Add various customization options
 2017-06-06 16:48:05 +02:00
Mario Danic
ee2d09be97 Fix a typo 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-06-06 13:27:16 +02:00
Mario Danic
d0692f72f4 Fix ui when not using account choose 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-06-06 13:24:05 +02:00
Mario Danic
b530d38b07 Add various customization options 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-06-06 11:32:29 +02:00
Nextcloud bot
962c5bee7e
[tx-robot] updated from transifex 2017-06-06 00:27:03 +00:00
Nextcloud bot
9ec47db602
[tx-robot] updated from transifex 2017-06-05 00:26:28 +00:00
AndyScherzinger
de8bb6a691
Merge branch 'master' of https://github.com/nextcloud/android into pinchZoom 
# Conflicts:
#	src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
 2017-06-05 00:38:52 +02:00
Nextcloud bot
3ac9c40469
[tx-robot] updated from transifex 2017-06-04 00:27:38 +00:00
Nextcloud bot
3de6aa9b51
[tx-robot] updated from transifex 2017-06-03 00:25:35 +00:00
Nextcloud bot
1e66a8235a
[tx-robot] updated from transifex 2017-06-02 00:27:31 +00:00
Nextcloud bot
22044ec663
[tx-robot] updated from transifex 2017-06-01 00:25:29 +00:00
Mario Đanić
037236f095 Merge pull request #1043 from nextcloud/fixingContactBackup 
Fixing contact backup
 2017-05-31 22:16:28 +02:00
AndyScherzinger
265d6ced52
scope members 2017-05-31 22:09:26 +02:00
AndyScherzinger
dd54aa7207
Merge branch 'master' of https://github.com/nextcloud/android into fixingContactBackup 2017-05-31 21:55:31 +02:00
Mario Đanić
de28b9fb70 Merge pull request #1058 from nextcloud/lib_1_0_21 
Fix chunked uploads
 2017-05-31 21:46:24 +02:00
Andy Scherzinger
def4f5821c update lib to 1.0.21 2017-05-31 21:45:15 +02:00
Andy Scherzinger
ce3a8bf3d7 Merge pull request #1012 from nextcloud/activitiesImprovement 
Activities improvement
 2017-05-31 21:25:19 +02:00
Mario Đanić
1f351198e3 Merge pull request #1023 from nextcloud/SearchFeatureNC12only 
disable search related navigation entries in sidebar/bottombar
 2017-05-31 19:05:48 +02:00
tobiasKaminsky
b2094cdc8d disable search related navigation entries in sidebar/bottombar if server version is <12 2017-05-31 18:59:52 +02:00
Mario Danic
9631859548 Fix time 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-05-31 18:52:12 +02:00