Commit graph

7203 commits

Author SHA1 Message Date
Andy Scherzinger
957670eb97 Merge pull request #906 from nextcloud/manageAccountNPE
prevent NPE if quotaLink does not exist, e.g. in manageaccount activity
2017-04-28 11:25:02 +02:00
Mario Đanić
28582da92a Merge pull request #901 from nextcloud/gplay-edition
Gplay edition
2017-04-28 10:01:44 +02:00
tobiasKaminsky
50ffaaa993
- rename zstore to gplay
- only one build.gradle, but with commented lines for gplay/modified
2017-04-28 09:26:16 +02:00
tobiasKaminsky
7693705ef2
adding build variants to doc 2017-04-28 09:25:24 +02:00
Mario Đanić
fd161aa99f Merge pull request #897 from nextcloud/WebViewTitle
if webview show app name
2017-04-27 14:54:47 +02:00
tobiasKaminsky
57f0df279a
use themed color instead of white 2017-04-27 14:53:31 +02:00
Andy Scherzinger
dc2bacc857 Merge pull request #908 from nextcloud/missingBottomBar
add missing layout param
2017-04-27 14:19:53 +02:00
Andy Scherzinger
2de760428c Merge pull request #902 from comradekingu/language
Revamp of upstream strings
2017-04-27 14:19:12 +02:00
tobiasKaminsky
c5e2673309
add missing layout param 2017-04-27 13:05:19 +02:00
tobiasKaminsky
a5d255afed
prevent NPE if quotaLink does not exist, e.g. in manageaccount activity 2017-04-27 12:41:15 +02:00
Mario Đanić
da6175595c Merge pull request #898 from nextcloud/logoutButton
logout button in drawer
2017-04-27 11:31:35 +02:00
AndyScherzinger
d0521c1c89
rename flag from logout to show_drawer_logout 2017-04-27 11:28:59 +02:00
AndyScherzinger
7a4c75aebb
fix logout button coloring 2017-04-27 09:19:11 +02:00
tobiasKaminsky
de9aa39c87
logout button in drawer 2017-04-27 09:19:11 +02:00
Allan Nordhøy
b5c7833895 Revamp of upstream strings 2017-04-27 06:44:41 +02:00
Nextcloud bot
7e5d7f1f4e
[tx-robot] updated from transifex 2017-04-27 00:21:31 +00:00
Mario Danic
b0eb6039fb Codacy fix 2017-04-26 22:00:58 +02:00
Mario Danic
52e2c42df5 Disable analytics in gplay edition too 2017-04-26 21:59:46 +02:00
Mario Danic
5ecf2ea541 Fix up analytics 2017-04-26 21:59:46 +02:00
Mario Danic
7d1af571bc Set screen name for a few more screens 2017-04-26 21:58:58 +02:00
Mario Danic
9130635fa1 Progress on Analytics magic 2017-04-26 21:58:00 +02:00
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