AndyScherzinger
|
fee252176e
|
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders
# Conflicts:
# src/com/owncloud/android/MainApp.java
# src/com/owncloud/android/ui/activity/Preferences.java
|
2016-11-02 21:48:52 +01:00 |
|
Andy Scherzinger
|
612199a9b7
|
further CR fixes, fixed comment in layout/migration_layout.xml
|
2016-11-02 12:09:52 +01:00 |
|
Andy Scherzinger
|
6e73da2809
|
CR, GPLv3
|
2016-11-02 12:09:52 +01:00 |
|
Bartosz Przybylski
|
b38b3276e2
|
Add more migration stuff. cleanup step is still missing
|
2016-11-02 12:09:48 +01:00 |
|
AndyScherzinger
|
fc6e3fc458
|
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders
# Conflicts:
# res/layout/drawer.xml
# res/layout/drawer_header.xml
# src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
|
2016-11-02 00:18:24 +01:00 |
|
AndyScherzinger
|
50cbf61872
|
code review changes
|
2016-11-01 23:35:18 +01:00 |
|
AndyScherzinger
|
175816b70e
|
spacing fix (dp perfect)
|
2016-11-01 23:35:17 +01:00 |
|
AndyScherzinger
|
2e4fbe0268
|
fixed file headers
|
2016-11-01 23:35:17 +01:00 |
|
AndyScherzinger
|
ae0db114fb
|
housekeeping (file_actions and AccountActionsDialog aren't in use anymore due to multi select / account manager capabilities)
|
2016-11-01 23:35:17 +01:00 |
|
AndyScherzinger
|
4b60d13d65
|
layout fixes II
|
2016-11-01 23:35:17 +01:00 |
|
AndyScherzinger
|
2ab59c3c95
|
layoutfix
|
2016-11-01 23:35:16 +01:00 |
|
AndyScherzinger
|
e89531fc1a
|
optimized layout adding username + account-url
|
2016-11-01 23:35:16 +01:00 |
|
AndyScherzinger
|
42c61c9ed4
|
highlight currently active user
|
2016-11-01 23:35:16 +01:00 |
|
David A. Velasco
|
c098aca057
|
Show a check mark on the current account in the account manager
# Conflicts:
# res/layout/account_item.xml
# src/com/owncloud/android/ui/activity/ManageAccountsActivity.java
# src/com/owncloud/android/ui/adapter/AccountListAdapter.java
|
2016-11-01 23:35:15 +01:00 |
|
AndyScherzinger
|
a72056161c
|
only show folder path on topo with synced folder made bold
|
2016-10-27 15:32:49 +02:00 |
|
AndyScherzinger
|
34003e922f
|
moved to switch instead of icon
|
2016-10-27 12:04:36 +02:00 |
|
AndyScherzinger
|
235b01b4bf
|
fixed review comments
|
2016-10-26 18:08:25 +02:00 |
|
AndyScherzinger
|
29d5e1e8cb
|
tweaked layout for preferences
|
2016-10-26 14:02:40 +02:00 |
|
AndyScherzinger
|
cc45b0f1e9
|
added possibility to enable/disable sync folder in the settings screen
|
2016-10-26 12:14:56 +02:00 |
|
AndyScherzinger
|
9efa7de760
|
fix synced folder settings dialog theming + code cleanup
|
2016-10-24 15:52:16 +02:00 |
|
AndyScherzinger
|
0889f8a69e
|
grid spacing added + negative/shortened margins for containers for nice image grids
|
2016-10-13 02:00:49 +02:00 |
|
AndyScherzinger
|
e1273ee86d
|
ellipsizing
|
2016-10-09 23:30:23 +02:00 |
|
AndyScherzinger
|
b557b0762c
|
remote folder can now be changed, all config changes for a synced folder are now saved
|
2016-10-09 23:27:30 +02:00 |
|
AndyScherzinger
|
5214659b05
|
Merge branch 'master' of https://github.com/nextcloud/android into syncedFolders
|
2016-10-09 18:42:15 +02:00 |
|
Divay Prakash
|
cbbea085cb
|
Fix errors with float values #12
|
2016-10-07 21:57:08 +05:30 |
|
Divay Prakash
|
f48b0b074d
|
Fix magic numbers in uploader_list_item_layout.xml #12
|
2016-10-07 07:32:11 +05:30 |
|
Divay Prakash
|
db3f069d1e
|
Fix magic numbers in upload_list_layout.xml #12
|
2016-10-07 07:29:48 +05:30 |
|
Divay Prakash
|
d736536547
|
Fix magic numbers in upload_list_item.xml #12
|
2016-10-07 07:29:16 +05:30 |
|
Divay Prakash
|
a3ddb28692
|
Fix magic numbers in upload_list_group.xml #12
|
2016-10-07 07:23:32 +05:30 |
|
Divay Prakash
|
918bdd53e7
|
Fix magic numbers in upload_files_layout.xml #12
|
2016-10-07 07:22:48 +05:30 |
|
Divay Prakash
|
c02383bfed
|
Fix magic numbers in toolbar_standard.xml #12
|
2016-10-07 07:21:54 +05:30 |
|
Divay Prakash
|
0564e69836
|
Fix magic numbers in ssl_validator_layout.xml #12
|
2016-10-07 07:20:52 +05:30 |
|
Divay Prakash
|
544aa3997a
|
Fix magic numbers in ssl_untrusted_cert_layout.xml #12
|
2016-10-07 07:17:29 +05:30 |
|
Divay Prakash
|
2a782e7b2e
|
Fix magic numbers in simple_dialog_list_item.xml #12
|
2016-10-07 07:11:20 +05:30 |
|
Divay Prakash
|
2347018221
|
Fix magic numbers in share_user_item.xml #12
|
2016-10-07 07:09:27 +05:30 |
|
Divay Prakash
|
df77b299ee
|
Fix magic numbers in share_file_layout.xml #12
|
2016-10-07 07:07:40 +05:30 |
|
Divay Prakash
|
c8989afb66
|
Fix magic numbers in search_users_groups_layout.xml #12
|
2016-10-07 07:04:17 +05:30 |
|
Divay Prakash
|
b7e6c287c9
|
Fix magic numbers in preview_image_fragment.xml #12
|
2016-10-07 07:01:13 +05:30 |
|
Divay Prakash
|
7fe5e744eb
|
Fix magic numbers in preview_image_activity.xml #12
|
2016-10-07 06:59:22 +05:30 |
|
Divay Prakash
|
ce9df17acc
|
Fix magic numbers in popup.xml #12
|
2016-10-07 06:58:41 +05:30 |
|
Divay Prakash
|
7d7b9cfbc6
|
Fix magic numbers in passcodelock.xml #12
|
2016-10-07 06:55:10 +05:30 |
|
Divay Prakash
|
41fab305bd
|
Fix magic numbers in participate_layout.xml #12
|
2016-10-07 06:54:12 +05:30 |
|
Divay Prakash
|
3c698a7b39
|
Fix magic numbers in notification_with_progress_bar.xml #12
|
2016-10-07 06:50:46 +05:30 |
|
Divay Prakash
|
8dcbd21473
|
Fix magic numbers in media_control.xml #12
|
2016-10-07 06:45:34 +05:30 |
|
Divay Prakash
|
213574f805
|
Fix magic numbers in log_send_file.xml #12
|
2016-10-07 06:42:32 +05:30 |
|
Divay Prakash
|
1e95835491
|
Fix magic numbers in log_item.xml #12
|
2016-10-07 06:41:46 +05:30 |
|
Divay Prakash
|
f2b0fb91c0
|
Fix magic numbers in listrow_group.xml #12
|
2016-10-07 06:40:35 +05:30 |
|
Divay Prakash
|
f425d294c3
|
Fix magic numbers in listrow_details.xml #12
|
2016-10-07 06:39:21 +05:30 |
|
Divay Prakash
|
75a2cc8e43
|
Fix magic numbers in list_item.xml #12
|
2016-10-07 06:38:34 +05:30 |
|
Divay Prakash
|
ff83ba0f4d
|
Fix magic numbers in list_fragment_expandable.xml #12
|
2016-10-07 06:33:57 +05:30 |
|