Commit graph

10981 commits

Author SHA1 Message Date
Andy Scherzinger
a0630d9e68
Merge pull request #2773 from nextcloud/menuItemHighlighting
Correct menu highlighting
2018-07-12 17:56:19 +02:00
Andy Scherzinger
c5260c2484
Merge pull request #2789 from nextcloud/mListener
mlistener might be null?
2018-07-12 17:55:28 +02:00
Andy Scherzinger
d1848fab7d
Merge pull request #2795 from nextcloud/accountException
ThemeUtils: do not crash if context is null
2018-07-12 17:54:53 +02:00
Andy Scherzinger
506c91d2a3
Merge pull request #2817 from nextcloud/changelog-3.2.1
Add 3.2.1 changelog
2018-07-12 16:55:44 +02:00
Andy Scherzinger
c93bb553f0
Merge pull request #2801 from nextcloud/hardenExtraTextSubject
Harden extra text subject
2018-07-12 16:54:21 +02:00
Andy Scherzinger
d174fb955c
Merge pull request #2772 from nextcloud/backportDescription
Backport description
2018-07-12 16:51:07 +02:00
Andy Scherzinger
9c1c2d7f50
Merge pull request #2808 from nextcloud/codacy
Codacy
2018-07-12 15:51:48 +02:00
AndyScherzinger
4aecb705d1
rename string id 2018-07-12 09:51:27 +02:00
AndyScherzinger
0b8e40d828
Fix Toast texts 2018-07-12 09:51:27 +02:00
AndyScherzinger
6255bfeb9d
codacy: fix Useless parentheses 2018-07-12 09:51:26 +02:00
AndyScherzinger
559cdc70eb
codacy: fix identical 'catch' branch 2018-07-12 09:51:18 +02:00
Nextcloud bot
1da81aab6b
[tx-robot] updated from transifex 2018-07-12 00:45:43 +00:00
Andy Scherzinger
c9968163b0
Update 30020199.txt 2018-07-11 15:53:21 +02:00
Andy Scherzinger
b1b783a8d7
Update CHANGELOG.md 2018-07-11 15:53:05 +02:00
tobiasKaminsky
77dc1b4b04
add 3.2.1 metadata
adapt to fastlane

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-07-11 08:53:39 +02:00
Nextcloud bot
532d2a1b35
[tx-robot] updated from transifex 2018-07-11 00:45:51 +00:00
Nextcloud bot
e7894b1cc8
[tx-robot] updated from transifex 2018-07-10 09:10:53 +00:00
Nextcloud bot
51b35e41e3
[tx-robot] updated from transifex 2018-07-10 00:38:25 +00:00
Nextcloud bot
e32ca335fc
[tx-robot] updated from transifex 2018-07-09 00:38:04 +00:00
Nextcloud bot
0516b38cef
[tx-robot] updated from transifex 2018-07-07 00:38:53 +00:00
Nextcloud bot
b857d90440
[tx-robot] updated from transifex 2018-07-06 00:40:10 +00:00
tobiasKaminsky
a47fac3014
harden extraText/extraSubject
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-07-05 07:49:25 +02:00
tobiasKaminsky
26591e30af
do not crash if context is null
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-07-04 08:53:02 +02:00
tobiasKaminsky
654b4349a5
requireActivity
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-07-04 08:16:41 +02:00
tobiasKaminsky
969e0d113a
mListener might be null?
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-07-04 08:16:41 +02:00
Nextcloud bot
9d6592ea87
[tx-robot] updated from transifex 2018-07-04 00:39:55 +00:00
Tobias Kaminsky
1e7bab5782 daily dev 20180704 2018-07-04 00:32:57 +02:00
Andy Scherzinger
4803f9f55d
Merge pull request #2178 from nextcloud/removeCheckForOlderVersions
Remove check for older version (<11)
2018-07-03 19:26:40 +02:00
AndyScherzinger
fc36bf73d4
fix tests after rebase 2018-07-03 19:15:09 +02:00
AndyScherzinger
22e12b1310
lint: set @RequiresApi(api = Build.VERSION_CODES.N) for notification channel importance field 2018-07-03 19:02:26 +02:00
AndyScherzinger
8804c98ea0
add missing @NonNull annotations 2018-07-03 18:55:10 +02:00
AndyScherzinger
f7402a2e51
fixes after rebase 2018-07-03 18:50:36 +02:00
AndyScherzinger
a5345705c6
organize imports after rebase 2018-07-03 18:42:26 +02:00
AndyScherzinger
35b12083c0
revert back to master-branch lib version 2018-07-03 18:41:40 +02:00
tobiasKaminsky
dbd82f8d5b
changes due to rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-07-03 18:32:47 +02:00
tobiasKaminsky
aa9caf84b3
changes due to rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-07-03 18:32:47 +02:00
tobiasKaminsky
50c65dfca9
changes due to CR
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-07-03 18:32:46 +02:00
tobiasKaminsky
0867879f59
changes due to rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-07-03 18:32:32 +02:00
tobiasKaminsky
0b19ba7d9a
remove obsolete string
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-07-03 18:32:32 +02:00
tobiasKaminsky
a3e59c4352
remove check for older version (<11)
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-07-03 18:32:28 +02:00
Tobias Kaminsky
699af02257
Merge pull request #2784 from nextcloud/compareLint
On bot comment: show old and new lint
2018-07-03 10:07:41 +02:00
tobiasKaminsky
570fed7b12
show old and new lint
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-07-03 09:05:21 +02:00
Nextcloud bot
8241d84c80
[tx-robot] updated from transifex 2018-07-03 00:42:23 +00:00
Nextcloud bot
e245e6e436
[tx-robot] updated from transifex 2018-07-02 00:41:05 +00:00
Nextcloud bot
2002d7ddba
[tx-robot] updated from transifex 2018-07-01 00:43:09 +00:00
Tobias Kaminsky
486066f1c9 daily dev 20180630 2018-06-30 00:32:01 +02:00
Tobias Kaminsky
5823a3625a
Merge pull request #2774 from nextcloud/fixFindbugsStatus
Escape $summary correctly
2018-06-29 12:12:33 +02:00
tobiasKaminsky
aeb4e9babd
escape summary correctly
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-29 11:34:00 +02:00
tobiasKaminsky
e1127041c7
correct menu highlighting
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-29 11:18:23 +02:00
tobiasKaminsky
b1cc578745
backport description
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-06-29 10:36:35 +02:00