Commit Graph

1362 Commits

Author SHA1 Message Date
Daniel Molkentin
3906efcfbf Merge Mark's changes for the user manual 2014-07-22 16:46:35 +02:00
Frank Karlitschek
4fd4fc5e24 Merge pull request #437 from owncloud/consistent_7_0_master
minor typo in admin manual
2014-07-22 10:42:00 -04:00
Jürgen Weigert
429f13d816 typo. 2014-07-22 16:36:01 +02:00
Morris Jobke
7efb77cff3 Merge pull request #433 from owncloud/fix-broken-sphinx
Fix broken sphinx
2014-07-16 22:44:16 +02:00
Morris Jobke
8652bf018f fix broken links 2014-07-16 14:18:31 +02:00
Morris Jobke
3c761f6f88 Fix errors and warnings in user_manual - limit img to max 100% width 2014-07-16 13:56:19 +02:00
Morris Jobke
6ca19be8cd Merge pull request #426 from owncloud/calendar.rst-changes
Calendar.rst changes
2014-07-16 13:44:17 +02:00
Morris Jobke
91bec6d7bc remove .snag file 2014-07-16 13:41:49 +02:00
Morris Jobke
e4599d47e4 syntax fixes & rename images - windows has case-insensitivity linux not 2014-07-16 13:40:24 +02:00
Mark Barnard
9cb0354119 Added *.snag files to .gitignore 2014-07-16 13:29:18 +02:00
Mark Barnard
75025ec2f3 Modifications to calendar.rst file.
Note to reviewers:  I don't see the "export button" or a way of opening
the "import dialog".  Please review that section carefully and provide
input.
2014-07-16 13:29:05 +02:00
Mark Barnard
2a9e3f53b6 calendar changes
Work in progress
2014-07-16 13:28:50 +02:00
Morris Jobke
1b02752a04 Merge pull request #430 from owncloud/fix-jenkins
fix jenkins build errors
2014-07-16 13:24:24 +02:00
Thomas Müller
c6c429638d Merge pull request #431 from owncloud/recommend-gmp-for-sftp
Recommend GMP extension for SFTP
2014-07-15 17:35:34 +02:00
Andreas Fischer
56be505c17 Recommend GMP extension for SFTP due to SSH Diffie-Hellman Key Agreement. 2014-07-15 16:54:17 +02:00
Vincent Petry
878ce69b94 Merge pull request #427 from josh4trunks/master
Remove try_files that was causing issues
2014-07-14 20:26:39 +02:00
Volkan Gezer
5d49bb1e29 fix jenkins errors 2014-07-13 18:20:58 +02:00
Morris Jobke
21f8e029b3 Merge pull request #410 from owncloud/bring-back-external
bring back external mount doc
2014-07-13 18:02:28 +02:00
Morris Jobke
7facb1f054 Merge pull request #429 from owncloud/oc7-doc-image
update oc7 document image
2014-07-13 18:01:37 +02:00
Volkan Gezer
5d1f861a39 update oc7 document image 2014-07-13 17:21:34 +02:00
josh4trunks
5a1e0dbeb1 Remove try_files that was causing issues
This 'try_files' was probably originally put in as a security measure against maliciously uploaded static objects that would be then executed as php. See here https://nealpoole.com/blog/2011/04/setting-up-php-fastcgi-and-nginx-dont-trust-the-tutorials-check-your-configuration/

This is not needed because 'fastcgi_split_path_info' line already guarantees only the intended php file is passed to PHP as the SCRIPT_FILENAME.
2014-07-10 21:11:00 -07:00
Mark Barnard
2137acdebc Merge pull request #423 from owncloud/contacts.rst-changes
Updated Contacts Doc
2014-07-10 11:05:04 -04:00
Mark Barnard
dd0df8f4d6 Removing question comments 2014-07-10 11:03:09 -04:00
Mark Barnard
9845bfae56 requires commit? 2014-07-09 09:29:33 -04:00
Mark Barnard
d3da2bd12e Updated Contacts Doc 2014-07-08 11:32:14 -04:00
Morris Jobke
c61ffb2339 Merge pull request #312 from RandolfCarter/stable6_fix_win_php_version_hint
Correct PHP installation hints
Conflicts:
	admin_manual/installation/installation_windows.rst
2014-07-04 12:24:09 +02:00
Mark Barnard
3db1326835 Merge pull request #415 from owncloud/filesweb-modifications
Fixing filesweb.rst nested info
2014-07-01 15:40:50 -04:00
Mark Barnard
ff60977b4e Fixing filesweb.rst nested info 2014-07-01 15:35:06 -04:00
Mark Barnard
dfa6f512e5 Merge pull request #414 from owncloud/scaling-images
scaling-images
2014-07-01 14:51:12 -04:00
Mark Barnard
1584971449 scaling-images
Bear with me.  :)
2014-07-01 14:49:28 -04:00
Mark Barnard
0930721758 Merge pull request #413 from owncloud/tweeking-webinterfaces.rst
Making some tweaks
2014-07-01 14:45:20 -04:00
Volkan Gezer
184e513be7 fix grammar 2014-07-01 20:36:13 +02:00
Mark Barnard
496de6c7f3 Making some tweaks
Minor tweaks and labeled last figure.
2014-07-01 14:20:24 -04:00
Mark Barnard
312be2ba24 Merge pull request #402 from owncloud/fixing-links
Added links for update.rst access
2014-07-01 08:26:39 -04:00
Volkan Gezer
add7d2c07b bring back external mount doc 2014-06-30 19:24:39 +02:00
Mark Barnard
45dfa58b30 Merge pull request #407 from owncloud/adding-level-4-to-logging
Adding level 4 to logging description
2014-06-28 11:19:43 -04:00
Mark Barnard
5815d42b88 Adding level 4 to logging description 2014-06-28 11:09:28 -04:00
Frank Karlitschek
d3ad65e9f8 Merge pull request #406 from owncloud/add-amahi
add amahi instructions link. Fixes #404.
2014-06-28 08:40:30 -04:00
Volkan Gezer
b7846cc061 add amahi instructions link 2014-06-28 13:46:20 +02:00
Morris Jobke
4a8d78fd11 Merge pull request #350 from owncloud/replace-echo-usage
Replace echo usage
2014-06-28 10:40:10 +02:00
Mark Barnard
041014877b Added links for update.rst access
Also enhanced steps.
2014-06-27 16:48:15 -04:00
Mark Barnard
1f306b1bca Merge pull request #400 from owncloud/fixing-numbers
Fixing numbers; low impact
2014-06-27 12:36:25 -04:00
Mark Barnard
dc5b37c6f5 Fixing numbers
# not functioning properly.  Might be indents.
2014-06-27 12:34:40 -04:00
Mark Barnard
ec8938bb0b Merge pull request #397 from owncloud/adding-upgrade-changes
Changes to upgrade procedures; edits included
2014-06-27 11:08:13 -04:00
Mark Barnard
62adf94b80 Fixed markup
using auto tagging
2014-06-27 11:06:44 -04:00
Mark Barnard
718b5507a6 Changes to upgrade procedures 2014-06-27 10:56:51 -04:00
Mark Barnard
2f7fbd5fbd Merge pull request #396 from owncloud/update.rst-changes
Changes to update instructions
2014-06-27 09:59:17 -04:00
Mark Barnard
2186016a53 Changes to update instructions
Added new text and images.
2014-06-27 09:51:00 -04:00
Mark Barnard
6c36d70fa1 Ignore DB 2014-06-27 09:30:10 -04:00
Bernhard Posselt
cf3fe0946e Update routes.rst 2014-06-26 14:31:01 +02:00