wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11925 commits 157 branches 562 tags 714 MiB
Commit graph

11925 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jenkins for ownCloud
6c534c8165 [tx-robot] updated from transifex 2013-06-14 02:52:34 +02:00
Florin Peter
62f4ed7009 Merge branch 'master' into fixes_for_3641_3620 2013-06-14 01:14:33 +02:00
Thomas Müller
8edb56de05 Merge pull request #3690 from owncloud/use_execute_audited_in_filecache 
use executeAudited in files cache
 2013-06-13 13:55:55 -07:00
Thomas Müller
2a58cf8117 Merge pull request #3686 from owncloud/minor_exception_cleanup 
minor cleanup for exception handling
 2013-06-13 13:50:31 -07:00
Morris Jobke
c6fd3f9820 Merge pull request #3586 from owncloud/contributing 
Revise Contributing document
 2013-06-13 12:36:11 -07:00
Morris Jobke
5a214817f2 Fix typo 2013-06-13 22:35:32 +03:00
Florin Peter
8566881758 fix for path_hash not unique as reported at #3641 2013-06-13 20:52:34 +02:00
Florin Peter
35da408222 fix memory problems as reported at #3620 2013-06-13 20:51:22 +02:00
Björn Schießle
7889f2ef5c Merge pull request #3687 from owncloud/template_updates 
Make templates aware of different owncloud editions
 2013-06-13 07:32:41 -07:00
Björn Schießle
15eda53215 improved footer 2013-06-13 16:10:33 +02:00
Björn Schießle
4bafa4e81a Merge pull request #3558 from owncloud/files_encryption_check_private_key 
check if the decrypted private key is valid on login and on read/write files
 2013-06-13 04:18:32 -07:00
Björn Schießle
7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key 
Conflicts:
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/lib/util.php
 2013-06-13 13:17:35 +02:00
Jörn Friedrich Dreyer
31f7afe56a PDOException has no previous(), oh the consistency ... 2013-06-13 13:14:00 +02:00
Björn Schießle
dd8011925a Merge pull request #3552 from owncloud/files_encryption_upgrade_fix 
Fix files_encryption app upgrade from 4.5 to 5.0
 2013-06-13 03:54:19 -07:00
Björn Schießle
bc2862fcb9 Merge branch 'master' into files_encryption_upgrade_fix 2013-06-13 12:53:29 +02:00
Thomas Müller
54f3174665 Merge pull request #3640 from infoneo/master 
Folders with multiple periods problem fix
 2013-06-13 03:34:36 -07:00
Björn Schießle
2b179ccff0 Merge pull request #3668 from owncloud/encryption_migrate_only_once 
make sure that only one process can enter the migration mode
 2013-06-13 03:31:31 -07:00
Björn Schießle
fd5042cc46 Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_encryption_upgrade_fix 2013-06-13 10:49:23 +02:00
Jan-Christoph Borchardt
a178de8501 Merge pull request #3677 from owncloud/apps-buttons 
remove App management top bar and move buttons more contextually in the interface
 2013-06-13 01:44:48 -07:00
Björn Schießle
2f1005f05f LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed 2013-06-13 10:44:05 +02:00
Björn Schießle
6394fedb33 add comment to explain the helper function 2013-06-13 10:35:30 +02:00
Björn Schießle
77944cf7b8 fix typo in var name 2013-06-13 10:11:23 +02:00
Jenkins for ownCloud
c989e32adc [tx-robot] updated from transifex 2013-06-13 02:20:23 +02:00
Thomas Mueller
84a8aea410 restore Updater functionality on non-Windows platforms 2013-06-13 00:09:52 +02:00
Florin Peter
2daec351d4 update submodule 2013-06-12 23:21:24 +02:00
Jörn Friedrich Dreyer
54f9477f34 fix another double wrapped array 2013-06-12 23:01:52 +02:00
Morris Jobke
86fe30bd4c TL;DR and remove link from "Report issue here" 2013-06-12 21:58:19 +02:00
Michael Gapczynski
2a3887a5d7 Add tests for the updater with mount points 2013-06-12 15:32:00 -04:00
Jörn Friedrich Dreyer
6d55a062be remove additional array wrapping 2013-06-12 21:23:34 +02:00
Björn Schießle
27fcdb3af5 Merge branch 'master' into files_encryption_upgrade_fix 
Conflicts:
	apps/files_encryption/tests/crypt.php
 2013-06-12 20:53:45 +02:00
Jörn Friedrich Dreyer
d3eadcde56 use executeAudited in files cache 2013-06-12 20:11:53 +02:00
Thomas Tanghus
3584d48d65 Merge pull request #3679 from owncloud/multiselect-fixes 
Multiselect fixes
 2013-06-12 09:52:15 -07:00
Roland Hager
2df8468b2f Revert "FIX: Download of files named "true" or "false" impossible" 
This reverts commit d2d71c8797.
which was accidentally commited
 2013-06-12 18:30:28 +02:00
Frank Karlitschek
06808eddf3 Merge pull request #3676 from owncloud/move-storage-bar 
move storage bar below clients showcase to make it more visible
 2013-06-12 09:02:16 -07:00
Björn Schießle
63472aed3f Merge branch 'template_updates' of github.com:owncloud/core into template_updates 2013-06-12 17:26:38 +02:00
Roland Hager
d2d71c8797 FIX: Download of files named "true" or "false" impossible 
It was not possible to download a file called "true" or "false" (caseinsensitive) when clicking the link "download" due to the result of json_decode().
Both cases are now implicitly checked.

Hotfix provided by Herbert Pophal
 2013-06-12 17:25:21 +02:00
Björn Schießle
2141c41d0d add logo-claim 2013-06-12 17:20:09 +02:00
Björn Schießle
2e1836c1da don't show translation hints in enterprise edition 2013-06-12 17:07:43 +02:00
Jan-Christoph Borchardt
f565e4c25b move common settings footer fieldset out of conditional 2013-06-12 16:59:23 +02:00
Björn Schießle
7a575cc2d7 short explanation about OC_Defaults 2013-06-12 16:33:09 +02:00
Björn Schießle
7273f38af6 make pub link share footer aware of different owncloud editions 2013-06-12 16:28:47 +02:00
Björn Schießle
839bce80c6 make main menu aware of the different owncloud editions 2013-06-12 16:20:23 +02:00
Björn Schießle
5c6a854489 add default doc url 2013-06-12 16:19:28 +02:00
Jörn Friedrich Dreyer
f7dc07602b minor cleanup for exception handling 2013-06-12 15:48:22 +02:00
Björn Schießle
e1e798c623 make footer and urls aware of ownCloud editions 2013-06-12 15:44:11 +02:00
Björn Schießle
b29e01d5cf keep all strings in one place to make it easier to change them 2013-06-12 15:15:08 +02:00
Björn Schießle
918906f042 make footer aware of ownCloud editions 2013-06-12 14:49:30 +02:00
Jan-Christoph Borchardt
4cafe21aa4 apps management: change misleading + to ... 2013-06-12 14:49:23 +02:00
eMerzh
e33f68ecb6 Correct escaping 2013-06-12 14:36:28 +02:00
Brice Maron
edc255421c Try connection with specified db when postgres does not work 
Conflicts:

	lib/setup.php
 2013-06-12 14:36:07 +02:00