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

16935 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin McCorkell
340cd2734b Merge pull request #7766 from Xenopathic/master 
Fix smb4php to work with home shares
 2014-03-18 19:42:04 +00:00
Vincent Petry
1f79f368ef Added unit tests for when adding ext storage mount points 
- test config was written correctly (global and local)
- test that personal mount points can be added for allowed backends
- test that personal mount points cannot be added for disallowed backends
- added $skipTest flag to make it possible add mount points without
  doing an actual check/connection (note: this is necessary because the
  static class OC_Mount_Config cannot be mocked)
 2014-03-18 18:29:08 +01:00
Thomas Tanghus
13f1f105c8 Set overflow-y to auto 2014-03-18 18:25:30 +01:00
Thomas Müller
76961ce072 fixing javascript error where $(Files.breadcrumbs[1]).get(0) returns undefined - happens on resize to a very small width 2014-03-18 17:59:21 +01:00
Vincent Petry
8ababef4cd Fix validation of allowed personal backend 2014-03-18 17:54:14 +01:00
Jan-Christoph Borchardt
59906fbb4d mobile: show caret indicator next to logo to make clear it is tappable 2014-03-18 17:48:28 +01:00
Thomas Müller
6b9ae27b90 drop file cache migration OC5 -> OC6 2014-03-18 17:14:38 +01:00
Vincent Petry
67b8cfedf9 Define _matchMedia wrapper earlier 
The unit test stub didn't work because the _matchMedia wrapper
was defined too late.

This fix defines it earlier.
 2014-03-18 16:02:13 +01:00
Vincent Petry
cc6c152984 Fixed matchMedia usage to make unit tests work in PhantomJS 
PhantomJS has a bug that makes it impossible to properly stub
window.matchMedia. This fix adds a wrapper as OC._matchMedia
that is used for unit tests
 2014-03-18 15:52:06 +01:00
Vincent Petry
fe04106e0f Add/remove main menu action when switching between desktop/mobile mode 2014-03-18 13:10:13 +01:00
Morris Jobke
f6c3667efa Merge pull request #7784 from owncloud/enc-adminpageallowupload 
Display admin option for public upload with encryption enabled
 2014-03-18 12:49:38 +01:00
Jan-Christoph Borchardt
285fc5ba96 mobile: change CSS order so rename and versions are hidden 2014-03-18 11:50:08 +01:00
Thomas Müller
effea790c7 redefine reopen() in class \OC\Session\Internal to avoid accidental calls in productive code 2014-03-18 11:44:22 +01:00
Vincent Petry
b75ca9fb50 Display admin option for public upload with encryption enabled 
Now that public upload works with encryption, the admin option to toggle
it must be made visible.
 2014-03-18 11:28:56 +01:00
Jenkins for ownCloud
d744e2c176 [tx-robot] updated from transifex 2014-03-18 01:55:31 -04:00
Thomas Müller
a4a185cc71 updating 3rdparty submodule 2014-03-17 22:22:16 +01:00
Thomas Müller
153eadd753 Merge branch 'master' into close-session-faster-master 2014-03-17 21:57:48 +01:00
Thomas Müller
6bbbf8536f introduce reopen() method to be used for unit test execution only - right after a unit test has been executed the session will be reopened 2014-03-17 21:57:10 +01:00
Thomas Müller
756bbe8786 Merge pull request #7649 from owncloud/routing-public 
Move routing classes to an interface and expose it in the public api
 2014-03-17 21:07:05 +01:00
Vincent Petry
872006da03 Only enable toggle for sidebar in mobile mode 2014-03-17 20:44:30 +01:00
Thomas Müller
ea8705bac8 additional class is added to the file actions called e.g. 'action-share', 'action-rename' 
in order to allow proper translations of the action's display name an additional parameter has been added to the register function
 2014-03-17 20:15:10 +01:00
Thomas Tanghus
413afab424 Replace console.time/timeEnd 2014-03-17 19:39:19 +01:00
Vincent Petry
3cd09f2b09 Added PostgreSQL version warning on upgrade 2014-03-17 18:58:00 +01:00
Vincent Petry
082c4cda50 Increase version to trigger upgrade related to .ocdata 2014-03-17 17:58:19 +01:00
jamesryanbell
4fc96ebb7b SVG support detection 
The SVGSupport checkMimeType method was failing on my setup as the headers are all returned in lowercase. I have lowercase all the indexes and modified the if statement so that it doesn't matter what case the headers are returned in
 2014-03-17 16:11:49 +00:00
Robin Appelman
38b1529c2a More robust way to check if the folder is empty 2014-03-17 17:03:32 +01:00
Robin Appelman
332c14a878 Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache 2014-03-17 16:35:08 +01:00
Robin McCorkell
792d0d3314 Fix smb4php to work with home shares 
Stat'ing a share with url_stat now checks if the user can run 'ls' in that share rather than checking if the share is listed by the server. This means that OwnCloud can now mount user home shares, which are never listed by the server.
 2014-03-17 15:03:25 +00:00
icewind1991
6fbf3dd7c4 Merge pull request #7764 from owncloud/datadir-chmod 
use a non-recursive chmod on the datadir
 2014-03-17 15:52:44 +01:00
icewind1991
5c72b526a3 Merge pull request #7760 from owncloud/core-roundbytes 
Correctly round bytes when converted from human readable format
 2014-03-17 15:21:57 +01:00
Lukas Reschke
239069c838 Use $installedVersion instead of $currentVersion 2014-03-17 13:27:42 +01:00
Vincent Petry
df7853363a Merge pull request #7761 from owncloud/improve_documentation 
clarify the use-case of the encryption app.
 2014-03-17 13:23:35 +01:00
icewind1991
4112d63a40 Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarning 
Added warning for trusted_domains after CLI upgrade
 2014-03-17 13:21:54 +01:00
Vincent Petry
bd98538a36 Merge pull request #7704 from owncloud/preview_use_pre_instead_of_post_delete_hook_2 
use preDelete instead of postDelete hook
 2014-03-17 12:59:35 +01:00
Vincent Petry
43ebd8cb64 Merge pull request #7728 from owncloud/oc_image_show_save_custom_mime 
make it possible to influence output type of \OC_Image
 2014-03-17 12:58:40 +01:00
Robin Appelman
166dfbf58b use a non-recursive chmod on the datadir 2014-03-17 12:53:55 +01:00
Frank Karlitschek
8a24e1eb96 clearify the use-case of this app 2014-03-17 12:29:17 +01:00
Vincent Petry
145db370d1 Correctly round bytes when converted from human readable format 
Instead of leave two decimal places which is confusing, round the byte
values correctly to the closest byte.
 2014-03-17 12:15:12 +01:00
Thomas Müller
cd038604d3 unit tests for specific image type output added 2014-03-17 08:40:59 +01:00
Thomas Müller
79ba930ef9 fixing PHPDoc 2014-03-17 08:17:56 +01:00
Jenkins for ownCloud
518903c6eb [tx-robot] updated from transifex 2014-03-17 01:56:06 -04:00
Morris Jobke
7ffaf0d70a Merge pull request #7734 from owncloud/icon-class-remove 
remove unneeded icon class
 2014-03-16 10:24:57 +01:00
Jenkins for ownCloud
c89aa6d5fe [tx-robot] updated from transifex 2014-03-16 03:13:21 -04:00
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