Commit Graph

1783 Commits

Author SHA1 Message Date
Carla Schroder
361a2c347f Revert "Add ios_library and android_library to TOC, markup corrections" 2014-11-19 17:44:23 -08:00
Carla Schroder
7ba49fe097 Merge pull request #663 from owncloud/revert-662-tocdepth
Revert "testing wonky TOC"
2014-11-19 17:26:52 -08:00
Carla Schroder
cf1fc4e0aa Revert "testing wonky TOC" 2014-11-19 17:26:41 -08:00
Carla Schroder
820cd29052 Merge pull request #662 from owncloud/tocdepth
testing wonky TOC
2014-11-19 16:52:39 -08:00
Carla Schroder
5f510f07cc testing wonky TOC 2014-11-19 16:51:51 -08:00
Carla Schroder
a6c94af3e6 Merge pull request #661 from owncloud/devtoc
Add ios_library and android_library to TOC, markup corrections
2014-11-19 16:28:54 -08:00
Carla Schroder
a78de151d7 Add ios_library and android_library to TOC, markup corrections 2014-11-19 16:22:38 -08:00
Carla Schroder
0754ab7c58 Merge pull request #659 from owncloud/clientdev
Link to the android app development info
2014-11-19 13:53:00 -08:00
Carla Schroder
1f964f3cc1 Merge pull request #660 from owncloud/encryptwin
fix windows section on configuration openssl
2014-11-19 12:47:47 -08:00
Carla Schroder
3d907f328b fix windows section on configuration openssl 2014-11-19 12:46:20 -08:00
Jos Poortvliet
d6f736a9f0 Link to the android app development info 2014-11-19 21:19:11 +01:00
Carla Schroder
63dc6646af Merge pull request #658 from owncloud/typos
small typo fixes
2014-11-19 10:44:35 -08:00
Carla Schroder
e82b4c6936 small typo fixes 2014-11-19 10:42:17 -08:00
Carla Schroder
133f96a0c0 Merge pull request #655 from owncloud/encryptionfix
Add section for windows servers
2014-11-18 12:18:12 -08:00
Carla Schroder
d5bb2ff712 Add section for windows servers 2014-11-18 12:16:54 -08:00
Carla Schroder
6c111c75dd Merge pull request #651 from owncloud/alphabeta
reorganize and clean up CE admin manual
2014-11-17 19:33:31 -08:00
Carla Schroder
7bd4fb801a reorganize and clean up CE admin manual 2014-11-17 19:21:51 -08:00
Morris Jobke
8b131b51cc Merge pull request #650 from florianjacob/master
ownCloud runs on Microsoft Windows, not Word ;)
2014-11-16 20:48:28 +01:00
Florian Jacob
0668988ffe ownCloud runs on Microsoft Windows, not Word ;)
Thanks to Kopiás Csaba for reporting.
2014-11-16 18:55:04 +01:00
Morris Jobke
b2537aa7b7 Merge pull request #649 from RandolfCarter/DBConversionTypes
DB Conversion: add valid types
2014-11-15 11:20:13 +01:00
Randolph Carter
a2c3b34842 DB Conversion: add valid types 2014-11-15 00:57:03 +01:00
Morris Jobke
0ab12c6be6 Merge branch 'marcdexet-cnrs-master' 2014-11-14 14:50:27 +01:00
marcdexet-cnrs
658cbed32f update doc about possible mistake
Routing is case sensitive, be carefull about the appName case.
2014-11-14 14:49:49 +01:00
Bernhard Posselt
3b5526b4c4 Merge pull request #642 from owncloud/3rdparty
improve the description of 3rd party app handling
2014-11-11 12:00:58 +01:00
Morris Jobke
326d6ee09d Merge pull request #646 from stephengraf/patch-1
Update configuration_nginx.rst
2014-11-11 08:48:23 +01:00
stephengraf
a3ed2f17ca Update configuration_nginx.rst 2014-11-10 23:06:12 -08:00
Carla Schroder
5d277affa7 Merge pull request #638 from leron49/master
Delete migration documentation
2014-11-07 15:39:16 -08:00
Jos Poortvliet
87503e05f8 improve the description of 3rd party app handling, hopefully dealing with lots of confusion about that. 2014-11-07 17:24:33 +01:00
Carla Schroder
ebb761659d Merge pull request #641 from owncloud/fixes
small fixes and cleanups
2014-11-06 20:37:33 -08:00
Carla Schroder
0589b33809 small fixes and cleanups 2014-11-06 20:34:41 -08:00
leron49
dcc7943d4e Delete import/export documentation
This documentation is false, user_migrate dont exist.
2014-11-04 14:33:37 +01:00
leron49
959a5e3697 Delete import/export documentation 2014-11-04 14:32:46 +01:00
Morris Jobke
e77045f8c6 update documentation generated from config.sample.php 2014-11-04 09:26:34 +01:00
Morris Jobke
057939fddb Merge pull request #635 from joaoepj/patch-2
Update auth_ldap.rst
2014-10-31 18:50:16 +01:00
joaoepj
1f2fe2c00c Update auth_ldap.rst
In line 480, the verb is missing in the sentence "...In this case the user cannot their 
avatar...". I suppose you meant "...In this case the user cannot alter their 
avatar...".
2014-10-31 11:06:50 -02:00
Morris Jobke
b8f9649880 Merge pull request #634 from marmuDev/patch-1
Update js.rst
2014-10-31 12:17:36 +01:00
marmuDev
79de1f64ab Update js.rst
AngularJS: var app...
missing closing "]" before ").config..."
2014-10-30 21:52:20 +01:00
Bernhard Posselt
e6657dcd1f fix #416 2014-10-30 16:35:01 +01:00
Bernhard Posselt
44398abac8 Merge pull request #633 from joaoepj/patch-1
Update auth_ldap.rst
2014-10-30 16:23:51 +01:00
joaoepj
fe20fbb4ff Update auth_ldap.rst
LDAPS default port is 636 instead of 686.
2014-10-30 12:27:01 -02:00
Morris Jobke
66e86aad87 update config.sample.php generated documentation 2014-10-29 20:37:32 +01:00
Carla Schroder
19dfec2fb6 Merge pull request #626 from owncloud/add_lost_documentation_of_libraries_for_mobile_clients
Added developer documentation for Android and iOS libraries to get acces...
2014-10-29 10:52:38 -07:00
Carla Schroder
18e4722d6e Merge pull request #632 from owncloud/add-some-advanced
Add hardened permission example
2014-10-28 21:15:02 -07:00
Carla Schroder
91c83c9fb7 Update installation_source.rst 2014-10-28 21:13:22 -07:00
Carla Schroder
d9cfbda871 Update installation_source.rst 2014-10-28 21:11:24 -07:00
Lukas Reschke
9f8bbc2bf3 Add hardened permission example 2014-10-28 18:22:34 +01:00
Bernhard Posselt
b7f5f405ba Merge pull request #631 from owncloud/add-l10n-hin
Add information how to add hints
2014-10-27 18:07:21 +01:00
Lukas Reschke
090d87bcee Add information how to add hints 2014-10-27 18:05:42 +01:00
Bernhard Posselt
64db762cb8 Merge pull request #474 from menelic/master
Create installing_apps.rst
2014-10-27 12:22:15 +01:00
menelic
928835c963 Update installing_apps.rst 2014-10-27 12:13:20 +01:00