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
3854 commits 226 branches 1571 tags 618 MiB
Commit graph

459 commits

Author SHA1 Message Date
David A. Velasco
1ff57e0665 HOT FIX: recovered lost strings 2015-09-07 10:07:54 +02:00
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
dbed65610b fix for the progress bar on pre lollipop devices via manipulating windowFrame, windowBackground and windowTitleBackgroundStyle 2015-08-18 22:09:53 +02:00
Andy Scherzinger
da89715045 reverted back to light colored login 2015-08-18 17:48:10 +02:00
Jorge Antonio Diaz-Benito Soriano
eb1e41bc76 Added error messages for copy action. English only. 2015-08-18 17:04:47 +02:00
Andy Scherzinger
e79f92f566 Conflict Dialog Fix 2015-08-18 13:57:09 +02:00
Jorge Antonio Diaz-Benito Soriano
7c19fcdc94 Added error messages for copy action. English only. 2015-08-18 13:44:28 +02:00
Jorge Antonio Diaz-Benito Soriano
fe5b6aa4a8 Added copy action 2015-08-18 13:35:28 +02:00
Andy Scherzinger
a393531774 visual fix for Progress DialogFragment(s) 2015-08-18 13:08:58 +02:00
Andy Scherzinger
ba80646e4e Fix for 4.0 file action context menu (re-implement it via DialogFragment) 2015-08-17 15:58:03 +02:00
Andy Scherzinger
92af92ee3b merged part of the fixes from material buttons branch to fix bugs reported in PR #1076 2015-08-14 17:18:36 +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
ddd01569cd Optimized translucence for lollipop on image preview 2015-08-06 19:14:52 +02:00
Andy Scherzinger
6b6227125b added back translucent action bar for image preview 2015-08-06 19:04:22 +02:00
Andy Scherzinger
9d9efd1c1d Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar 
Conflicts:
	owncloud-android-library
 2015-08-06 17:23:02 +02:00
Andy Scherzinger
a257935b8c Bugfix für Lollipop AlertDialog Bug (see styles), moved away from android referenced icon to self-shipped version for design consistency 2015-08-06 17:13:00 +02:00
Andy Scherzinger
1ce7d79ff0 Move alert dialog to material variant and setting the correct accent color for the button texts via styles 2015-08-06 16:27:56 +02:00
purigarcia
91000ba405 change the subject 2015-08-06 10:23:27 +02:00
Andy Scherzinger
97b9932d81 changed color for hint text on login screens to 777 2015-08-05 13:36:12 +02:00
Andy Scherzinger
e36349f77e fixing the progressbar corner glitch, bumping style of indeterminate animation to material style via appcompat, fixing progress bar for folder picker too, see comment 2015-08-04 18:32:33 +02:00
David A. Velasco
156cb5e81b Updated conflict message (same as in web app) 2015-08-04 17:29:42 +02:00
Andy Scherzinger
f7f468b578 extracted color values for download fragment, see comments 172c3f56a3 2015-08-04 17:06:27 +02:00
Andy Scherzinger
10c5498879 extracted text colors for account setup to color.xml, see e72caebbce comments 2015-08-04 16:41:53 +02:00
tobiasKaminsky
1327ce7315 renamed string values 2015-08-04 12:39:56 +02:00
AndyScherzinger
c49fbfb02c adding a new accent color see #1076 comment by @jancborchardt 2015-07-27 16:34:16 +02:00
AndyScherzinger
49b3acd2be added indeterminate progress bar to show activity since this isn't supported by AppCompat anymore 2015-07-26 17:52:29 +02:00
AndyScherzinger
8f401a38d8 redone color changes for login screen 2015-07-26 02:10:51 +02:00
AndyScherzinger
d474239b21 initial material design changes for the action bar 2015-07-26 01:49:27 +02:00
purigarcia
61e6191342 change the name of the method from keepInSync to favorite. Other changes commented in the review 2015-07-22 18:13:45 +02:00
purigarcia
7df9aa7310 add unfavorite option in context menu 2015-07-08 08:50:24 +02:00
purigarcia
ebe5a62f73 change the name from favorites to keep_up_to_date 2015-07-08 08:43:49 +02:00
David A. Velasco
8107d9dc4f Fixed wrong format of files & folder count 2015-06-23 14:40:51 +02:00
David A. Velasco
8c5b2b7b13 Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2 2015-06-22 14:56:13 +02:00
David A. Velasco
69a5b6f25d More i18n-friendly format for footer in list of files (no string composition) 
Conflicts FIXED:
	res/values/strings.xml
 2015-06-22 11:42:37 +02:00
masensio
e7710e7383 Update string subject_token and update library reference 2015-06-19 15:11:49 +02:00
masensio
75fd0f40c6 Merge branch 'develop' into forbidden_characters_from_server 
Conflicts:
	owncloud-android-library
	src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
	src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
 2015-06-15 14:51:13 +02:00
David A. Velasco
66f3a45d05 Merge branch 'develop' into navigationDrawer_basic 
Conflicts FIXED:
	res/layout/files.xml
 2015-06-15 13:43:17 +02:00
masensio
febe1fef89 Add new string message for forbidden characters controlled by the server 2015-06-02 11:07:34 +02:00
David A. Velasco
0117006313 Fixed update of id.home action bar button on navigation through FileDisplayActivity 2015-06-02 01:00:14 +02:00
purigarcia
916bd5c6ca Merge branch 'develop' into automationTest 2015-05-29 14:17:52 +02:00
David A. Velasco
41b5eb13b1 Merge remote-tracking branch 'origin/navigationDrawer_basic' into navigationDrawer_basic 2015-05-29 13:46:30 +02:00
David A. Velasco
27148acf16 Fixed style in log-in activity; should be Light, as before 2015-05-29 13:30:02 +02:00
masensio
cf535b70f1 Disable 'Accounts' in Navigation Drawer 2015-05-29 11:32:36 +02:00
masensio
c20041d157 Merge branch 'remove_ActionBarSherlock' into navigationDrawer_update 
Conflicts:
	res/menu/main_menu.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/activity/Preferences.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
 2015-05-27 14:19:30 +02:00
masensio
a9dad9e480 Add content_description to Navigation Drawer options 2015-05-26 11:46:15 +02:00
masensio
101989b70c Move 'Logs' from Settings to Navigation Drawer 2015-05-26 09:11:27 +02:00
masensio
015eb6fee9 Disable On Device option in Navigation Drawer 2015-05-26 00:01:39 +02:00
masensio
4f2f0ceb80 Add actionBar 2015-05-25 12:39:05 +02:00
tobiasKaminsky
6d4207a06b Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update 2015-05-21 21:12:44 +02:00