mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity
3694 commits 225 branches 1574 tags 621 MiB
Commit graph

1429 commits

Author SHA1 Message Date
AndyScherzinger
35b971de10 further xxxhdpi cion work 2015-07-26 02:11:15 +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
Jenkins for ownCloud
82f4123260 [tx-robot] updated from transifex 2015-07-25 01:13:46 -04:00
Jenkins for ownCloud
3d18b6b207 [tx-robot] updated from transifex 2015-07-24 01:14:12 -04:00
David A. Velasco
c21fa6c6e5 Merge pull request #1050 from owncloud/favourites_context_menu 
'Kept-in-sync' renamed as 'Favourites' and added to context menu in list of files
 2015-07-23 09:37:13 +02:00
Jenkins for ownCloud
650c4fd290 [tx-robot] updated from transifex 2015-07-23 01:13:51 -04: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
Jenkins for ownCloud
1976dfe9a1 [tx-robot] updated from transifex 2015-07-20 01:14:05 -04:00
Jenkins for ownCloud
aab283a15b [tx-robot] updated from transifex 2015-07-18 01:14:06 -04:00
Jenkins for ownCloud
f173670351 [tx-robot] updated from transifex 2015-07-17 01:14:04 -04:00
Jenkins for ownCloud
48cd33ae2d [tx-robot] updated from transifex 2015-07-14 01:14:02 -04:00
Jenkins for ownCloud
05896ff491 [tx-robot] updated from transifex 2015-07-13 01:14:04 -04:00
Jenkins for ownCloud
00e6d45abb [tx-robot] updated from transifex 2015-07-12 01:14:02 -04:00
Jenkins for ownCloud
7bb1307a6b [tx-robot] updated from transifex 2015-07-11 01:14:06 -04:00
purigarcia
a3bfcdcd85 Merge branch 'develop' into favourites_context_menu 2015-07-10 08:44:56 +02:00
Jenkins for ownCloud
1e08c40f31 [tx-robot] updated from transifex 2015-07-10 01:14:03 -04:00
Jenkins for ownCloud
d32032fc96 [tx-robot] updated from transifex 2015-07-09 01:14:02 -04: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
purigarcia
e0efee57b4 add keep up to date option in the menu 2015-07-08 08:36:10 +02:00
Jenkins for ownCloud
7623a8af61 [tx-robot] updated from transifex 2015-07-08 01:14:04 -04:00
masensio
629cff2d3f Merge branch 'master' into develop 2015-07-07 13:15:35 +02:00
masensio
174fa1f36b delete values-tzl 2015-07-07 10:41:22 +02:00
Jenkins for ownCloud
cfe5b84573 [tx-robot] updated from transifex 2015-07-05 01:14:02 -04:00
Jenkins for ownCloud
d762a8747b [tx-robot] updated from transifex 2015-07-03 01:15:16 -04:00
Jenkins for ownCloud
491e8a0bb3 [tx-robot] updated from transifex 2015-07-01 01:14:53 -04:00
Jenkins for ownCloud
eaf860d7c1 [tx-robot] updated from transifex 2015-06-30 01:13:52 -04:00
Jenkins for ownCloud
9ab961aa88 [tx-robot] updated from transifex 2015-06-29 01:13:34 -04:00
Jenkins for ownCloud
93b6c37400 [tx-robot] updated from transifex 2015-06-28 01:13:41 -04:00
Jenkins for ownCloud
24c564ab5f [tx-robot] updated from transifex 2015-06-27 01:13:58 -04:00
David A. Velasco
9babe1b38c Merge branch 'develop' into release-1.7.2 2015-06-25 14:43:04 +02:00
Jenkins for ownCloud
b4c217b505 [tx-robot] updated from transifex 2015-06-25 01:13:56 -04:00
Jenkins for ownCloud
4aed07aae1 [tx-robot] updated from transifex 2015-06-24 01:13:55 -04:00
masensio
378b28f346 Update some file icons 2015-06-23 14:50:02 +02:00
David A. Velasco
8107d9dc4f Fixed wrong format of files & folder count 2015-06-23 14:40:51 +02:00
David A. Velasco
36128298d4 Updated file icons with higher resolutions 2015-06-23 14:40:49 +02:00
Jenkins for ownCloud
51a539f4ee [tx-robot] updated from transifex 2015-06-23 01:14:15 -04: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
masensio
fb57bbc8c8 Merge pull request #1023 from owncloud/fix_issues_from_Transifex 
Message with count of list(s) and folder(s) reestructured for better translations
 2015-06-22 14:14:36 +02:00
masensio
2fbd757d66 Merge branch 'develop' into fix_shared_by_link_for_server_without_public_uploads 
Conflicts:
	owncloud-android-library
 2015-06-22 14:03:21 +02:00
masensio
84678c9903 Fix: Import file from other app shows all folders as TextView 2015-06-22 12:58:41 +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
Jenkins for ownCloud
a860ff6f96 [tx-robot] updated from transifex 2015-06-22 01:13:55 -04:00
Jenkins for ownCloud
37b2991755 [tx-robot] updated from transifex 2015-06-21 01:13:57 -04:00
Jenkins for ownCloud
f6abd41e09 [tx-robot] updated from transifex 2015-06-20 01:14:01 -04:00
masensio
e7710e7383 Update string subject_token and update library reference 2015-06-19 15:11:49 +02:00
Jenkins for ownCloud
f150ccd21c [tx-robot] updated from transifex 2015-06-19 01:13:55 -04:00
Jenkins for ownCloud
95bdfc0643 [tx-robot] updated from transifex 2015-06-18 01:14:01 -04:00
David A. Velasco
3febfa1e08 Merge pull request #1014 from owncloud/forbidden_characters_from_server 
Delegate check of forbidden characters on server, for OC >= 8.1
 2015-06-17 09:20:27 +02:00
Jenkins for ownCloud
122ee28b85 [tx-robot] updated from transifex 2015-06-17 01:13:57 -04:00
Jenkins for ownCloud
32470c97eb [tx-robot] updated from transifex 2015-06-16 01:14:07 -04: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
Jenkins for ownCloud
42da742d5e [tx-robot] updated from transifex 2015-06-15 01:13:52 -04:00
Jenkins for ownCloud
f4f0750b1a [tx-robot] updated from transifex 2015-06-14 01:13:39 -04:00
Jenkins for ownCloud
96f64863d1 [tx-robot] updated from transifex 2015-06-13 01:13:55 -04:00
Jenkins for ownCloud
d094ea108d [tx-robot] updated from transifex 2015-06-12 01:13:56 -04:00
Jenkins for ownCloud
486ad08e79 [tx-robot] updated from transifex 2015-06-11 01:13:55 -04:00
Jenkins for ownCloud
2075255313 [tx-robot] updated from transifex 2015-06-10 01:13:39 -04:00
masensio
33fae4d071 Merge pull request #978 from owncloud/automationTest 
Automation test
 2015-06-08 12:53:15 +02:00
Jenkins for ownCloud
d93eb752a1 [tx-robot] updated from transifex 2015-06-08 01:13:49 -04:00
purigarcia
23af1d2310 Merge branch 'develop' into automationTest 2015-06-05 10:32:37 +02:00
Jenkins for ownCloud
e93502657c [tx-robot] updated from transifex 2015-06-05 01:13:53 -04:00
Jenkins for ownCloud
7194818bc0 [tx-robot] updated from transifex 2015-06-04 01:13:55 -04:00
Jenkins for ownCloud
9bf27e63a6 [tx-robot] updated from transifex 2015-06-03 01:13:53 -04:00
masensio
febe1fef89 Add new string message for forbidden characters controlled by the server 2015-06-02 11:07:34 +02:00
Jenkins for ownCloud
ed10941085 [tx-robot] updated from transifex 2015-06-02 01:13:46 -04: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
Jenkins for ownCloud
c74164ecd9 [tx-robot] updated from transifex 2015-05-31 01:13:34 -04:00
Jenkins for ownCloud
b1a99c83f6 [tx-robot] updated from transifex 2015-05-30 01:13:45 -04: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
6e2dd6b191 Enable fitsSystemWindows in drawer.xml 2015-05-28 13:18:56 +02:00
masensio
c83925b454 Add license in some files 2015-05-28 11:30:02 +02:00
masensio
db01425a07 Add NavigationDrawer to image preview 2015-05-28 11:07:14 +02:00
Jenkins for ownCloud
a544613d75 [tx-robot] updated from transifex 2015-05-28 01:13:53 -04:00
tobiasKaminsky
3dc9a78696 Updated to work with latest update 2015-05-27 18:50:09 +02:00
tobiasKaminsky
a75ffde65f Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update 2015-05-27 18:35:39 +02:00
tobiasKaminsky
e80828afed Merge branch 'navigationDrawer_update' of github.com:owncloud/android into navigationDrawer_update 2015-05-27 18:35:21 +02:00
masensio
35eb4dbfcf Update main_menu.xml 2015-05-27 16:53:35 +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
e7493203de Merge branch 'develop' into remove_ActionBarSherlock 2015-05-27 13:10:15 +02:00
tobiasKaminsky
bc5e05934f added rectangle with first character 2015-05-26 20:49:03 +02:00
masensio
0238727d13 Add ic_drawer for mdpi and xhdpi 2015-05-26 13:12:19 +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
Jenkins for ownCloud
973aa26b5d [tx-robot] updated from transifex 2015-05-26 01:13:51 -04: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
Jenkins for ownCloud
f22c19a28d [tx-robot] updated from transifex 2015-05-25 01:13:49 -04:00
Jenkins for ownCloud
6e8fab5503 [tx-robot] updated from transifex 2015-05-24 01:13:52 -04:00
Jenkins for ownCloud
9f094c8946 [tx-robot] updated from transifex 2015-05-23 01:13:49 -04:00
Jenkins for ownCloud
24a6dfda9e [tx-robot] updated from transifex 2015-05-22 01:13:49 -04:00
tobiasKaminsky
6d4207a06b Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update 2015-05-21 21:12:44 +02:00
masensio
5f2820355d Merge branch 'develop' into navigation_drawer 
Conflicts:
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
 2015-05-21 09:46:59 +02:00
Jenkins for ownCloud
07acad20b5 [tx-robot] updated from transifex 2015-05-21 01:13:53 -04:00
masensio
288c148b51 Merge pull request #955 from owncloud/thumbnailOOM 
HOTFIX: prevent OOM when scrolling Thumbnails
 2015-05-20 11:07:14 +02:00