Commit graph

24 commits

Author SHA1 Message Date
AndyScherzinger
e3f8a49f3f
remove unused code 2016-11-10 10:20:06 +01:00
tobiasKaminsky
1183e51c19 Merge remote-tracking branch 'owncloud/multiSelect' into multiSelectOwncloud
# Conflicts:
#	res/drawable-hdpi/ic_checkbox_marked.png
#	res/drawable-mdpi/ic_checkbox_marked.png
#	res/drawable-xhdpi/ic_checkbox_marked.png
#	res/drawable-xxhdpi/ic_checkbox_marked.png
#	res/layout/grid_image.xml
#	res/values/strings.xml
#	src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java
#	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
#	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
#	src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
#	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2016-06-23 21:10:58 +02:00
Lukas Reschke
5efd275dc8
New screenshots 2016-06-20 15:00:34 +02:00
Lukas Reschke
5cf6c12705
Use Nextcloud naming 2016-06-12 18:07:05 +02:00
Lukas Reschke
821991868d
Use Nextcloud documentation 2016-06-12 18:07:04 +02:00
Andy Scherzinger
063921b170 Fixed Version Strings 2016-05-04 11:13:46 +02:00
Carla Schroder
65f01bf0ec upload errors 2016-05-04 11:13:45 +02:00
Carla Schroder
f908fe6dc9 add notes on upload failures and recovery 2016-05-04 11:13:45 +02:00
Carla Schroder
9bd72587f5 remove unneeded image 2016-05-04 11:13:44 +02:00
Carla Schroder
b1441b2fdf add Update status indicator 2016-05-04 11:13:43 +02:00
Carla Schroder
07d2f60e2e updates for 2.0 release 2016-05-04 11:13:42 +02:00
Carla Schroder
bf5bcd90db Updates for 1.9.1 release 2016-02-10 12:08:29 -08:00
Andy Scherzinger
a812784ddd Merge branch 'master' of https://github.com/owncloud/android into material_buttons
Conflicts (resolved):
	res/layout/drawer.xml
	res/values/colors.xml
	res/values/setup.xml
2015-12-28 20:03:25 +01:00
Carla Schroder
1fea82efde update submodule & integrate new theme changes 2015-12-07 16:48:21 -08:00
Carla Schroder
2d8b063595 update version number in conf.py 2015-12-04 14:37:20 -08:00
Carla Schroder
df56333624 update for 1.9 release w expanded sharing 2015-12-04 14:27:19 -08:00
Carla Schroder
b455705d4c more file management options 2015-11-05 09:48:53 -08:00
Carla Schroder
e55bf94498 Updated with new images and text for 1.8 2015-11-04 15:18:15 -08:00
Carla Schroder
b7664364d7 Update version number 2015-01-27 16:35:45 -08:00
Daniel Molkentin
0bb94f3c29 user manual: Fix incorrect line wrapping in config file 2015-01-27 23:41:33 +01:00
Daniel Molkentin
67ea45aa9f Add means to build user manual via make 2015-01-27 23:40:53 +01:00
Daniel Molkentin
a9d12f3b1c manual: omit ocdoc/* during doc generation 2015-01-27 23:35:45 +01:00
Carla Schroder
7d1839ee96 add submodule to user manual 2015-01-27 12:11:26 -08:00
Carla Schroder
ead95b9d9c Add Android app manual to develop branch, and Allow building manual in owncloud themes 2015-01-27 12:07:43 -08:00