 Andy Scherzinger
|
e79f92f566
Conflict Dialog Fix
|
9 年之前 |
|
Andy Scherzinger
|
92af92ee3b
merged part of the fixes from material buttons branch to fix bugs reported in PR #1076
|
9 年之前 |
|
Andy Scherzinger
|
9d9efd1c1d
Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
|
9 年之前 |
 tobiasKaminsky
|
e1ab4a41aa
download file if "use server version"
|
9 年之前 |
|
tobiasKaminsky
|
1327ce7315
renamed string values
|
9 年之前 |
|
AndyScherzinger
|
d474239b21
initial material design changes for the action bar
|
9 年之前 |
 masensio
|
4f2f0ceb80
Add actionBar
|
10 年之前 |
|
masensio
|
a496f08717
Remove actionbarsherlock , replace it with Android Support Library (v7)
|
10 年之前 |
|
masensio
|
0bef9fdedb
Update year in license
|
10 年之前 |
|
masensio
|
3d3046dc26
Add author's line in license
|
10 年之前 |
 David A. Velasco
|
dae42a11b4
Added seasonal icon for winter holidays
|
11 年之前 |
|
masensio
|
6ace8ab1c1
Update packageName
|
11 年之前 |
|
masensio
|
7656cff3bb
Update package name
|
11 年之前 |
|
David A. Velasco
|
bdc0332c23
Copyright note fixes
|
12 年之前 |
|
David A. Velasco
|
2623e9c195
Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished
|
12 年之前 |
|
David A. Velasco
|
bb257ec729
Updated copyright in source files
|
12 年之前 |
|
David A. Velasco
|
6de96a9817
Fix conflict dialog to finish the container activity if BACK is pressed
|
12 年之前 |
 Bartek Przybylski
|
92080afefc
add licence header to files
|
12 年之前 |
|
Bartek Przybylski
|
6c32365704
Solving modified date and length conflicts
|
12 年之前 |
