mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-23 01:00:26 +03:00
Code Issues Projects Releases Packages Wiki Activity
5854 commits 221 branches 1589 tags 640 MiB
Commit graph

5854 commits

This branch
This branch
All branches
Author SHA1 Message Date
tobiasKaminsky
644f255238 show video placeholder correctly 2016-07-02 18:06:00 +02:00
Andy Scherzinger
e7b89bdcd2 Merge pull request #87 from nextcloud/gridBug 
check if correct adapter is used
 2016-07-02 18:02:50 +02:00
tobiasKaminsky
1edc488995 Merge remote-tracking branch 'remotes/origin/master' into video_thumbnail 2016-07-02 17:49:16 +02:00
tobiasKaminsky
7843c09c50 Merge remote-tracking branch 'remotes/owncloud/master' into video_thumbnail 2016-07-02 17:35:25 +02:00
tobiasKaminsky
c315b0e753 fix from CR 2016-07-02 13:36:50 +02:00
Tobias Kaminsky
0a4eba2c1a Merge pull request #86 from nextcloud/help 
new feedback email address / help redirects to forum
 2016-07-02 10:38:20 +02:00
tobiasKaminsky
d6ecf06f39 check if correct adapter is used 2016-07-01 18:37:17 +02:00
tobiasKaminsky
77573a3535 new feedback email address 
url help adjusted
 2016-07-01 17:46:25 +02:00
Andy Scherzinger
ab136a14a3 Merge branch 'multiSelect' of https://github.com/owncloud/android into multiSelectNew 
Conflicts:
	build.gradle
	oc_jb_workaround/build.gradle
	owncloud-android-library
	res/layout/uploader_layout.xml
	res/layout/uploader_list_item_layout.xml
	res/menu/file_actions_menu.xml
	res/values/setup.xml
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
	src/com/owncloud/android/db/PreferenceManager.java
	src/com/owncloud/android/files/FileMenuFilter.java
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/ui/activity/FolderPickerActivity.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
 2016-06-30 15:11:34 +02:00
jabarros
460e187713 Fix. Allow set multiple files as 'Available offline' 2016-06-30 13:02:29 +02:00
Andy Scherzinger
5d7c1f31e7 new open in app icon during multi select 2016-06-30 10:53:57 +02:00
Lukas Reschke
deb1453d63 Merge pull request #83 from nextcloud/fix-tx-config 
Add type for transifex
 2016-06-29 14:58:29 +02:00
Andy Scherzinger
2537fd267a Added transifex to contribution.md 2016-06-29 14:43:20 +02:00
Morris Jobke
b907793a42
Add type for transifex 2016-06-29 14:34:31 +02:00
Andy Scherzinger
bb1611b999 Merge pull request #80 from nextcloud/release_1_1_0 
RC 1.1.0 preparation
 2016-06-27 21:30:37 +02:00
Andy Scherzinger
89bf3e2073 Added Android Studio formatter setup 2016-06-27 20:26:49 +02:00
Andy Scherzinger
de3143627d fixed irc link 2016-06-27 20:10:05 +02:00
Andy Scherzinger
2882979041 fixed yet another typo 2016-06-27 20:08:28 +02:00
Andy Scherzinger
59f6022265 fixed typos 2016-06-27 20:07:26 +02:00
Andy Scherzinger
ede1039122 added PR #75 2016-06-27 20:06:14 +02:00
Andy Scherzinger
d33cad627d updated contribution version code concept 2016-06-27 20:05:09 +02:00
Andy Scherzinger
6c685a8307 correct version number for 1.1.0-RC1 --> 10010001 2016-06-27 19:56:31 +02:00
Andy Scherzinger
c60b938168 fix play store link 2016-06-27 19:51:55 +02:00
Andy Scherzinger
8e5d47aa0c fixed typo 2016-06-27 19:51:55 +02:00
Andy Scherzinger
9dc9441aae RC 1.1.0 preparation 2016-06-27 19:51:54 +02:00
Marius Blüm
36b24a9673 Merge pull request #75 from nextcloud/loginLayout 
Slight design optimizations for the login screen #22
 2016-06-27 18:52:53 +02:00
Andy Scherzinger
bc94cbf631 login button colors changed 2016-06-27 16:36:45 +02:00
Andy Scherzinger
c875bbace1 Merge pull request #35 from nextcloud/feature_uploadsubfolders 
Feature uploadsubfolders
 2016-06-27 10:45:41 +02:00
Tobias Kaminsky
0092a623c5 Merge pull request #74 from nextcloud/mabkenar-actual-current 
actual -> current
 2016-06-27 07:32:57 +02:00
Andy Scherzinger
718fec0935 remove card view, change edit text and icon coloring 2016-06-26 22:59:28 +02:00
Andy Scherzinger
96c8b5c658 Merge pull request #73 from nextcloud/f-droid-batch 
replace f-droid text link with a badge
 2016-06-26 13:18:47 +02:00
tobiasKaminsky
4c31190472 same markdown for both badgets 2016-06-26 09:42:55 +02:00
Masoud Abkenar
f5a56033a2 actual -> current 
Longman Dictionary says: Do not use actual to mean 'at the present time'. Use current or present
http://www.ldoceonline.com/dictionary/actual
http://english.stackexchange.com/questions/29654/using-actual-to-signify-current
 2016-06-26 08:45:59 +02:00
Andy Scherzinger
da8a8f1d44 Spacing 2016-06-25 22:36:26 +02:00
Andy Scherzinger
6ab9630031 Linebreak 2016-06-25 22:35:21 +02:00
Andy Scherzinger
8453972cf1 Indentation 2016-06-25 22:34:22 +02:00
Andy Scherzinger
56ca5d2a28 replace f-droid text link with a badge 2016-06-25 19:05:20 +02:00
Andy Scherzinger
ce402d844e Merge pull request #44 from nextcloud/1556_toolbar 
Modern Toolbar / Drawer / Account Switcher
 2016-06-25 18:14:05 +02:00
Andy Scherzinger
30ab5a6b57 code review: use string instead of object to not having to do instance of checks 2016-06-25 16:27:30 +02:00
Andy Scherzinger
78f1aa5f66 centralize handlePNG function 2016-06-25 16:27:30 +02:00
Andy Scherzinger
a466cfd109 PNG handling with NPE check first 2016-06-25 16:27:29 +02:00
Andy Scherzinger
5c44ea5884 Always process for png transparency 2016-06-25 16:27:29 +02:00
Andy Scherzinger
d413cfce0a enforce refresh during start 2016-06-25 16:27:28 +02:00
Andy Scherzinger
d6e31a20d5 fix progressbar within toolbar 2016-06-25 16:27:27 +02:00
Bartosz Przybylski
54f7e64414 Trying to generalize avatar setting. 2016-06-25 16:27:26 +02:00
Andy Scherzinger
880ac5f412 cleanups due to the code review, removing unused code 2016-06-25 16:27:25 +02:00
Andy Scherzinger
91f3629757 cleanup due to code review 2016-06-25 16:27:24 +02:00
Andy Scherzinger
bd7a50aabc add constants for margins and use different placeholder 2016-06-25 16:27:23 +02:00
Andy Scherzinger
e043dfbcb4 renamed getter method to be more java style like 2016-06-25 16:27:23 +02:00
Andy Scherzinger
7ff136854b layout fixes after rebase 2016-06-25 16:27:22 +02:00