Commit graph

7432 commits

Author SHA1 Message Date
tobiasKaminsky
726a02f39c Revert "remove firebase from branding branch and put it into branch "analytics""
This reverts commit 71ea26df31.
2017-04-26 21:57:59 +02:00
Andy Scherzinger
ded1ad1244 Merge pull request #865 from nextcloud/showBottomBar
bottom bar in all activities
2017-04-26 20:54:05 +02:00
tobiasKaminsky
41494099f2
bottom bar in all activities 2017-04-26 20:40:25 +02:00
Andy Scherzinger
5df2280ae7 Merge pull request #881 from nextcloud/fix_bug_preview_navigation
Bug #843 was Fixed
2017-04-26 20:06:33 +02:00
alejandro
0b6423ce72
Bug #843 was Fixed
PreviewImageActivity is removed from the stack activity
2017-04-26 19:25:44 +02:00
Nextcloud bot
4efd85c748
[tx-robot] updated from transifex 2017-04-26 15:19:56 +00:00
Nextcloud bot
5415a42f14
[tx-robot] updated from transifex 2017-04-26 15:15:55 +00:00
tobiasKaminsky
92f12ac6a9
if webview show app name 2017-04-26 15:23:39 +02:00
Andy Scherzinger
af2eef9f15 Merge pull request #872 from nextcloud/nullInSharedView
always refresh ocShares prior listing them to have an up-to-date ocFile
2017-04-26 09:34:10 +02:00
Nextcloud bot
3d71602697
[tx-robot] updated from transifex 2017-04-26 00:22:16 +00:00
Mario Đanić
8442c045c6 Merge pull request #870 from nextcloud/noFABinSearchView
disable FAB on searchViews
2017-04-25 18:59:03 +02:00
Mario Đanić
3b7d46abdc Merge pull request #867 from nextcloud/showSearchViewHeaders
show correct header for searchViews & fix icon color and text for favorites
2017-04-25 18:46:57 +02:00
Mario Đanić
d8f6d80b4e Merge pull request #866 from nextcloud/branding-options
Tweak davdroid config option
2017-04-25 18:39:06 +02:00
Nextcloud bot
4d9df8073a
[tx-robot] updated from transifex 2017-04-25 00:20:25 +00:00
AndyScherzinger
87b810b959
add title method 2017-04-24 11:56:53 +02:00
AndyScherzinger
5f3a1ce9bb
#871 make favorite icon yellow and fix headline adding "yet" 2017-04-24 10:16:48 +02:00
tobiasKaminsky
6ee4ab23c7
show correct header for searchViews 2017-04-24 09:41:44 +02:00
Nextcloud bot
081c058b4c
[tx-robot] updated from transifex 2017-04-24 00:20:35 +00:00
Nextcloud bot
a70967efc0
[tx-robot] updated from transifex 2017-04-23 00:20:25 +00:00
Nextcloud bot
98f1641fe8
[tx-robot] updated from transifex 2017-04-22 00:21:04 +00:00
tobiasKaminsky
5319a63c33
always refresh ocShares prior listing them to have an uptodate ocFile 2017-04-21 15:36:44 +02:00
tobiasKaminsky
42f2ed267d
disable FAB on searchViews 2017-04-21 13:49:39 +02:00
Mario Danic
ca1355bf10 Tweak davdroid config option 2017-04-21 12:36:43 +02:00
Mario Đanić
618c472a72 Merge pull request #861 from nextcloud/renameNightlyToDev
change all namings of beta/nightly to new "dev"
2017-04-21 10:03:20 +02:00
Mario Đanić
1e47bc41b8 Merge pull request #863 from nextcloud/bumpLibraryTo1_0_15
bump library to 1.0.15
2017-04-21 10:02:36 +02:00
Mario Đanić
847eaa9a9a Merge pull request #864 from nextcloud/fixMediaplayer2
fix mediaplayer for real this time
2017-04-21 10:01:59 +02:00
tobiasKaminsky
f33e022e7b
fix mediaplayer for real this time 2017-04-21 08:28:17 +02:00
tobiasKaminsky
197ccb7094
bump library
unify build.gradle files
2017-04-21 08:02:49 +02:00
tobiasKaminsky
550ae613a1
change all namings of beta/nightly to new "dev" 2017-04-21 07:32:24 +02:00
Nextcloud bot
dcc216b316
[tx-robot] updated from transifex 2017-04-21 00:20:51 +00:00
Andy Scherzinger
601c0aeef9 Merge pull request #860 from nextcloud/fix-build
Fix prefs
2017-04-20 23:22:24 +02:00
Mario Danic
f725ada65e Fix prefs 2017-04-20 23:17:25 +02:00
Mario Đanić
9739edbbec Merge pull request #624 from Flole998/master
Added fingerprint support
2017-04-20 22:40:50 +02:00
Mario Đanić
5d50a1cc44 Merge pull request #858 from nextcloud/favoritesSwitchToGrid
prevent NPE if trying to store grid preference for favorites/shared
2017-04-20 22:39:48 +02:00
Mario Đanić
5baf7860b2 Merge pull request #854 from nextcloud/swipeToRefreshSearch
Swipe to refresh search
2017-04-20 22:39:34 +02:00
Mario Đanić
27150277a7 Merge pull request #853 from nextcloud/fixLongClicking
fix missing long click in "search"
2017-04-20 22:39:01 +02:00
Mario Đanić
c19644f86b Merge pull request #852 from nextcloud/preventCrashWhileRotating
prevent crash when fetching search event while rotating
2017-04-20 22:38:47 +02:00
Mario Đanić
165f421984 Merge pull request #806 from nextcloud/externalLinks
External links
2017-04-20 22:38:24 +02:00
Mario Đanić
19705ff438 Merge branch 'master' into externalLinks 2017-04-20 22:37:56 +02:00
Mario Đanić
89f4d81ff1 Merge pull request #824 from nextcloud/contactBackupRestore
Contact backup & import
2017-04-20 22:36:00 +02:00
AndyScherzinger
299f08694f
fixes due to code review 2017-04-20 21:51:08 +02:00
tobiasKaminsky
fe6171571f
prevent NPE if trying to store grid preference for favorites/shared 2017-04-20 15:34:36 +02:00
tobiasKaminsky
9377f22f51
swipe to refresh for "search" 2017-04-20 11:26:22 +02:00
tobiasKaminsky
95d9ea014c
fix missing long click in "search" 2017-04-20 11:21:25 +02:00
tobiasKaminsky
9c1339b1e4
prevent crash when fetching search event while rotating 2017-04-20 10:32:45 +02:00
AndyScherzinger
ed59604d3f
fixes after rebase 2017-04-20 09:09:14 +02:00
AndyScherzinger
744a1fc549
fix remove line 2017-04-20 09:09:13 +02:00
AndyScherzinger
8bdb8614e6
fixes after rebase due to project structure changes 2017-04-20 09:09:13 +02:00
Flole
674b20364a
Fixed crashes when OEM removes Fingerprintmanager from system 2017-04-20 09:09:13 +02:00
Flole
cbb29e23eb
Removed useless check and double inverse 2017-04-20 09:09:12 +02:00