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

16997 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jenkins for ownCloud
b2e929d580 [tx-robot] updated from transifex 2014-03-15 02:14:22 -04:00
Vincent Petry
b619ff6076 Return 503 when a config/data dir error exists 2014-03-14 21:05:15 +01:00
Thomas Müller
bbbbb033f3 in case of phpunit executions calling header() and exit() is too bad 2014-03-14 18:20:33 +01:00
Georg Ehrke
3527adbbe1 OC_Image::_output() - throw exception instead of falling back to png 2014-03-14 18:19:16 +01:00
Thomas Müller
fe05c0c81b move session reset to endTest() - necessary because we need a valid session in the next unit tests setUp() call 2014-03-14 18:16:20 +01:00
Georg Ehrke
9dee3772eb remove image/pjpeg from OC_Image::_output 2014-03-14 18:12:33 +01:00
Vincent Petry
3c46dcd7dd Added .ocdata file to check for data folder validity 
In environments where the data folder is mount from another partition,
it is important to check that the data folder we see is actually the
real one. If the mount failed for some reasons, this fix will make
ownCloud temporarily unavailable instead of causing unpredictable
behavior.
 2014-03-14 15:36:35 +01:00
Jan-Christoph Borchardt
55c630ea7d remove unneeded icon class 2014-03-14 14:47:40 +01:00
Raghu Nayyar
0f0baa5303 Merge pull request #7725 from owncloud/body-public 
add 'body-public' ID to body in base layout so it can be identified via CSS
 2014-03-14 16:27:43 +05:30
Georg Ehrke
c140010e81 don't change mimetype of whole image object 2014-03-14 11:17:20 +01:00
Vincent Petry
1a116828cf Added warning for trusted_domains after CLI upgrade 
If trusted_domains is not set after a CLI upgrade, show a warning in the
output.
 2014-03-14 11:16:45 +01:00
Georg Ehrke
0c3c75efd5 always output a png 2014-03-14 11:14:09 +01:00
Georg Ehrke
6f96ab3e90 make it possible to influence output type of \OC_Image 2014-03-14 11:13:45 +01:00
Jan-Christoph Borchardt
74eb9bea22 add 'body-public' ID to body in base layout so it can be identified via CSS 2014-03-14 11:08:16 +01:00
Jan-Christoph Borchardt
ac48563efd add spans around replaced 'Shared' indicators to make text hide on mobile 2014-03-14 10:48:28 +01:00
Jan-Christoph Borchardt
b37aae9925 mobile: menu togglable for mobile, use code by @PVince81 2014-03-14 10:33:19 +01:00
Jan-Christoph Borchardt
ec67d7e635 mobile: first mobile fixes for Files. We still need to hide Rename and Versions 2014-03-14 09:16:53 +01:00
Jan-Christoph Borchardt
eb7b125254 mobile: position share dropdown 2014-03-14 09:15:20 +01:00
Jan-Christoph Borchardt
84c96c2bf7 mobile: don't require a minimum width for controls bar 2014-03-14 09:14:52 +01:00
Jenkins for ownCloud
53f5747ac1 [tx-robot] updated from transifex 2014-03-14 01:55:34 -04:00
Jenkins for ownCloud
49deb752cf [tx-robot] updated from transifex 2014-03-13 17:20:51 -04:00
Jenkins for ownCloud
4b802aa7cb [tx-robot] updated from transifex 2014-03-13 17:12:37 -04:00
Björn Schießle
b2757e621c Merge pull request #7686 from owncloud/ocs_fix_paths 
finally fix the paths for the OCS Share API
 2014-03-13 20:27:07 +01:00
ideaship
a5425e84f2 fix autoconfig 
In array_merge, $post overrides $opts (concerns data directory).
Always merge $post before calling display().
Default value for dbtype which may still be undefined in display().

Fixes several problems related to autoconfig:
- installation.php only showed $AUTOCONFIG data if it was called after
  install() had come back with errors
- if autoconfig.php was set, installation.php showed an editable field
  with the wrong data in it; then, regardless of any changes, the value
  from autoconfig.php was used
- installation.php used undefined indeces (dbtype, dbIsSet,
  directoryIsSet)
 2014-03-13 20:05:11 +01:00
Thomas Müller
a7695b8dd0 Merge pull request #7718 from owncloud/fixing-7345-master 
map transifex language ja_JP to ja
 2014-03-13 18:02:53 +01:00
Thomas Müller
7bd2a51be5 map transifex language ja_JP to ja 2014-03-13 17:57:14 +01:00
Thomas Müller
fc697c7298 adding StartSessionListener which initializes the session before each test case execution 2014-03-13 16:19:17 +01:00
Robin Appelman
eabeedb306 Merge branch 'master' into cachehooks-first 2014-03-13 15:22:00 +01:00
Bjoern Schiessle
9d32475260 finally fix the paths for the OCS Share API 2014-03-13 15:16:59 +01:00
Robin Appelman
a8eb7a5092 Allow setting the config dir to use as enviroment variable for phpunit 2014-03-13 13:33:09 +01:00
Morris Jobke
3c03ff5bb5 Merge pull request #7340 from owncloud/hide_remove_image_avatar 
Hide remove image, if there's no custom avatar
 2014-03-13 13:20:00 +01:00
Morris Jobke
206364cd1c remove invalid shares with one SQL statement 2014-03-13 13:09:32 +01:00
Vincent Petry
02be15ce2f Added backticks for Oracle in sharing updater unit test 2014-03-13 13:09:32 +01:00
Morris Jobke
4bb303cbd6 Clean up database before setup the database for testing 2014-03-13 13:09:32 +01:00
Morris Jobke
ec54bc7709 Refactor update script to class and add unit test 2014-03-13 13:09:32 +01:00
Jamie McClelland
d58fda7ff3 fix update to remove shares where file doesn't exist on postgres 
Without patch, breaks with: Failed to upgrade "files_sharing".
Exception="SQLSTATE[22P02]: Invalid text representation: 7 ERROR:
invalid input syntax for integer: "5,179""

See: https://github.com/owncloud/core/issues/5758

removing unnecessary cruft - no parameter is set, none to pass.

https://github.com/owncloud/core/issues/5758

removing subquery, making more readable

See: https://github.com/owncloud/core/pull/6016#issuecomment-29510979

parameters to sql calls should be arrays

https://github.com/owncloud/core/pull/6016

boosting version to ensure fix gets executed

properly escaping the sql select statement

removing extraneous closing paren.
 2014-03-13 13:09:31 +01:00
Vincent Petry
9fa9c791eb Merge pull request #7671 from fpiraneo/patch-1 
Update index.php
 2014-03-13 13:04:30 +01:00
Georg Ehrke
f438337493 improve validation of getFileInfo in \OC\Preview 2014-03-13 12:32:13 +01:00
Jenkins for ownCloud
1295e54173 [tx-robot] updated from transifex 2014-03-13 01:55:50 -04:00
Georg Ehrke
8048868bd7 use preDelete instead of postDelete hook 2014-03-13 03:14:42 +01:00
rnveach
e37455493b added missing packages required to run "karma" and "phantomjs" inside 
"autotest-js"
 2014-03-12 19:22:11 -04:00
rnveach
820b161fc4 added missing ignores for files and directories created by "autotest-js" 2014-03-12 19:20:59 -04:00
Lukas Reschke
b506de6f08 Merge pull request #7681 from owncloud/remove-Sabre_DAV_Browser_Plugin-master 
remove Sabre_DAV_Browser_Plugin
 2014-03-12 22:28:01 +01:00
Vincent Petry
b2ac8755ce Merge pull request #6632 from eduardosan/master 
Fix PostgreSQL port configuration on install
 2014-03-12 18:52:47 +01:00
Vincent Petry
5fcfb2ef84 Merge pull request #7564 from owncloud/issue/7559 
Hide QMail when not selected and hide SendMail when not available on the server
 2014-03-12 18:32:38 +01:00
kondou
556c6eca23 Use OC_Util::formatDate() 2014-03-12 17:53:39 +01:00
kondou
c5440fa133 Move cron status to the right of the heading 2014-03-12 17:29:26 +01:00
Vincent Petry
b92be2ef1c Merge pull request #7669 from owncloud/versions_predelete 
add preDelete hook for files_versions app
 2014-03-12 17:23:54 +01:00
Vincent Petry
881739cbac Merge pull request #7668 from owncloud/trashbin_predelete 
add preDelete hook for files_trashbin app
 2014-03-12 17:23:38 +01:00
Thomas Müller
612b52abc5 Merge pull request #7695 from owncloud/fix-3rdparty-master 
Re-add submodule 3rdparty
 2014-03-12 17:12:18 +01:00