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

15513 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
eca9f69282 Merge pull request #6053 from owncloud/remove_passwords_from_log 
remove passwords from logfile
 2013-11-26 04:53:02 -08:00
Morris Jobke
16ce56553c Merge pull request #6056 from owncloud/check_login 
check if user is logged in
 2013-11-26 04:50:43 -08:00
Morris Jobke
a48fc120d0 Merge pull request #6054 from owncloud/extstorage-dropboxfixes 
Fixed various Dropbox issues + unit tests
 2013-11-26 04:48:54 -08:00
Morris Jobke
5cb1ce4a28 Merge pull request #6057 from owncloud/extstorage-touchoperation 
Return true when touch succeeds
 2013-11-26 04:40:25 -08:00
Bjoern Schiessle
5d2299eab8 only create complete share key if we know the exact path 2013-11-26 13:30:59 +01:00
Arthur Schiwon
69518b9013 Make sure Avatar is set from LDAP upon first login, not later, but also not before due to missing user folder 2013-11-26 12:57:39 +01:00
Vincent Petry
712b47757a Updated unit tests for SMB 
- coverage for touch return value
- fixed directory provider to exclude unsupported cases
 2013-11-26 12:53:03 +01:00
Bjoern Schiessle
2556647a10 check if user is logged in 2013-11-26 12:47:59 +01:00
Vincent Petry
e102eec89a Return true when touch succeeds 2013-11-26 12:47:00 +01:00
Bjoern Schiessle
62afe7fe7a remove passwords from logfile 2013-11-26 12:26:32 +01:00
Andreas Fischer
06df3822a0 Timestamp test is no longer necessary as we rely on Doctrine and DateTime. 2013-11-26 12:22:08 +01:00
Andreas Fischer
3bbaba1eca Use the Doctrine to convert date string to DateTime object. 2013-11-26 12:21:31 +01:00
Andreas Fischer
a330b2ef9b Use DateTime object instead of fixed format date string. 
Use a DateTime object and have conversion handled by Doctrine instead of using
a date string with a fixed format.
 2013-11-26 12:00:31 +01:00
Vincent Petry
7c81ac3d28 Fixed various Dropbox issues + unit tests 
- fixed touch function to return true on success
- fixed local metadata cache to remove deleted files/directories
- fixed getMetaData() to ignore files reported as deleted by
  Dropbox
- fixed "file not found" case to not log as exception
- fixed "overwrite on rename" case
- fixed unit tests to exclude unsupported cases
- added unit test for touch return value
- unit tests for Dropbox should all run correctly now
 2013-11-26 11:59:36 +01:00
Andreas Fischer
9fb1da2811 Use bindValue() instead of passing parameters in execute(). 2013-11-26 11:50:14 +01:00
Bjoern Schiessle
0617e06f69 use POST instead of GET 2013-11-26 11:38:49 +01:00
Bjoern Schiessle
35a6ad255d fix typo in var name 2013-11-26 11:38:45 +01:00
Jenkins for ownCloud
dc67c7efa9 [tx-robot] updated from transifex 2013-11-26 04:04:05 -05:00
Morris Jobke
faf14b4c79 Merge pull request #5937 from owncloud/calc_version_size 
use oc filesystem operations to calc the versions size
 2013-11-25 23:36:18 -08:00
Bjoern Schiessle
46dff0677d Merge branch 'master' into calc_version_size 2013-11-26 00:03:54 +01:00
Bjoern Schiessle
8974107b4e remove debug output 2013-11-25 23:57:08 +01:00
Bjoern Schiessle
d6fb2afa85 show a message at the log-in screen if inital encryption take place 2013-11-25 23:49:05 +01:00
Vincent Petry
5310a5924b Merge pull request #6044 from owncloud/extstorage-ftpunittestfix 
Fixed FTP storage unit tests to use the correct class
 2013-11-25 14:21:34 -08:00
Morris Jobke
d7d7d9b8e3 Merge pull request #6036 from owncloud/single-user-mode 
Add "single user mode"
 2013-11-25 14:10:07 -08:00
Arthur Schiwon
03375d6c52 LDAP: username2dn should only return DNs that belong to the current LDAP server. Might be not perfect. Easy perfect solution would increase communication with LDAP server. Let's see if it is good enough 2013-11-25 22:08:11 +01:00
Arthur Schiwon
3955388f20 LDAP: proxy: configurable return to determine when to try the next LDAP server and when to return (multi server setup) 2013-11-25 22:05:00 +01:00
Robin Appelman
9fbccc83e3 merge master into single-user-mode 2013-11-25 21:25:04 +01:00
Owen Winkler
844b4785f1 Merge pull request #6034 from owncloud/fix-api-documentation 
Fix api documentation
 2013-11-25 11:17:16 -08:00
icewind1991
4626fae882 Merge pull request #6038 from owncloud/occ-app-enable 
add occ commands for enabling and disabling apps
 2013-11-25 10:12:49 -08:00
Vincent Petry
c3e34676ba Improved unit test for "overwrite on move" 
Now using a different content to make sure the file was overwritten.
 2013-11-25 18:54:58 +01:00
Vincent Petry
af7118aa5d Added unit test for "overwrite file on rename/move" 
Also fixed "rename" unit test that was ready the result out of the wrong
file.
 2013-11-25 18:52:14 +01:00
Vincent Petry
944d4156bf Fixed FTP storage unit tests to use the correct class 2013-11-25 18:44:34 +01:00
Robin Appelman
abe63bd329 Add occ command to list all apps 2013-11-25 17:34:16 +01:00
Robin Appelman
fc1d897ea5 rename app_id to app-id 2013-11-25 17:28:01 +01:00
Jörn Friedrich Dreyer
4b67d4258d Merge pull request #6035 from owncloud/fixing-rawpath-reverseproxy-oc6 
Fixing rawpath reverseproxy oc6
 2013-11-25 08:21:33 -08:00
Thomas Müller
a42d152ac3 Merge pull request #6037 from owncloud/fix-6007-oc6 
adding chunked upload handling
 2013-11-25 08:16:45 -08:00
Thomas Müller
1fdd2ac7ee adding documentation for registerRoutes() 2013-11-25 17:15:08 +01:00
Raghu Nayyar
a5bfa6b1c3 Merge pull request #6040 from owncloud/fix-navbar-css 
Fix navbar issue
 2013-11-25 08:10:57 -08:00
Morris Jobke
4dc35909b5 Fix navbar issue 
fixes #6024
 2013-11-25 17:04:19 +01:00
Bjoern Schiessle
f8fcd567a7 move files to owners trash 2013-11-25 16:51:31 +01:00
Morris Jobke
b3e7e54c8d fix some capital letters 2013-11-25 16:42:28 +01:00
Morris Jobke
4e0fa85307 page level doc blocks and class descriptions 2013-11-25 16:39:01 +01:00
Morris Jobke
bc8cc9142e AppFramework(Controller|HTTP|HTTP-Responses|Middleware), IContainer API fixes 2013-11-25 16:28:24 +01:00
icewind1991
019f3299b0 Merge pull request #6030 from owncloud/cli-errors 
provide more cli friendly error messages when in cli mode
 2013-11-25 07:06:48 -08:00
Robin Appelman
a609a53647 add documentation for single user config option to config.sample.php 2013-11-25 16:01:42 +01:00
Robin Appelman
1bcb04f94e Add template for single user mode message 2013-11-25 15:59:37 +01:00
Thomas Müller
27cc333dfe adding chunked upload handling 2013-11-25 15:35:26 +01:00
Robin Appelman
a324c09e6c Add occ command to enable and disable single user mode 2013-11-25 15:27:05 +01:00
Robin Appelman
71c1327691 Add "single user mode" which restricts access to users in the admin group 
This can be enabled by setting 'singleuser' to true in config.php
 2013-11-25 15:08:24 +01:00
Thomas Müller
b9fed935b4 in case uri and script name don't match we better throw an exception 2013-11-25 14:42:34 +01:00