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

14826 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
7125bfba21 Merge pull request #5678 from owncloud/fix-api-documentation 
Fix api documentation
 2013-11-03 06:38:44 -08:00
Morris Jobke
ba2dd3b37c Merge pull request #5671 from owncloud/fixing-5668-master 
replace template function link_to_docs() with \OC_Helper::linkToDocs()
 2013-11-03 05:08:56 -08:00
Morris Jobke
ef592981ea unify license headers for public API files 2013-11-03 13:51:39 +01:00
Morris Jobke
d2a48d58ce fix "No page-level DocBlock" 2013-11-03 13:38:25 +01:00
Morris Jobke
2dcaa4ddbf Merge pull request #4961 from owncloud/unshare-over-delete 
Use OCP\Share::unshare() instead of directly using OCP\Share::delete()
 2013-11-03 04:07:42 -08:00
Andreas Fischer
7c1f0da0fe Always select item_source. 2013-11-03 12:34:40 +01:00
Andreas Fischer
fa56aec4b8 Deduplicate expiration date check into a method. 2013-11-03 12:34:38 +01:00
Andreas Fischer
779b87d46a Use unshareItem() when unsharing expired shares. 2013-11-03 12:33:34 +01:00
Andreas Fischer
ebf1694795 Use unshareItem() in unshareAll(). 2013-11-03 12:33:34 +01:00
Andreas Fischer
1d1f5b288e Extract unshare() code into unshareItem(). 2013-11-03 12:33:34 +01:00
Andreas Fischer
329299e34c OCP\Share::unshareAll(): Deduplicate hook parameters. 2013-11-03 12:33:31 +01:00
Andreas Fischer
8872b881cc Add tests for OCP\Share::unshareAll(). 2013-11-03 12:31:53 +01:00
VicDeo
a937272379 Merge pull request #5672 from owncloud/fixing-5668-master-2 
fixing Specified key was too long; max key length is 767 bytes
 2013-11-03 01:21:18 -07:00
Thomas Mueller
f22684cb3d fixing Specified key was too long; max key length is 767 bytes 2013-11-02 20:52:38 +01:00
Thomas Mueller
eb3c5070c0 replace template function link_to_docs() with \OC_Helper::linkToDocs() 2013-11-02 19:11:46 +01:00
Thomas Müller
d25c8b43e6 Merge pull request #5652 from owncloud/front-port-5647-master 
[WIP] extend unit test to directories starting or ending in whitespace
 2013-11-01 23:11:33 -07:00
Bart Visscher
06b42f9788 Merge pull request #5443 from owncloud/fix-autoloader-caching 
Remove Autoloader Cache Hack. Do not use Cache on Install.
 2013-11-01 05:35:34 -07:00
Morris Jobke
eb0ecaa13c Merge pull request #5658 from owncloud/session-error-full-sentence 
[Trivial] Make "Please contact your system administrator" a full sentence.
 2013-11-01 05:08:19 -07:00
Andreas Fischer
b6bb2b26dd Make "Please contact your system administrator" a full sentence. 2013-11-01 11:35:02 +01:00
Morris Jobke
f5b42c63d4 Merge pull request #5653 from owncloud/fix-api-documentation 
fix documentation stuff
 2013-11-01 02:56:03 -07:00
Morris Jobke
fad2149e3f Merge pull request #5551 from owncloud/fix-5202-master 
When updating an appstore app, execute a database update
 2013-10-31 11:10:28 -07:00
Morris Jobke
0dbe90cc9a fix documentation stuff 2013-10-31 19:00:53 +01:00
Jörn Friedrich Dreyer
ae469b67a0 Merge pull request #5637 from owncloud/fix_privatedata 
Fix privatedata
 2013-10-31 10:26:47 -07:00
Jörn Friedrich Dreyer
b4cdac0a60 Merge pull request #5591 from owncloud/home-storage 
Make home folders movable without requiring rescans
 2013-10-31 10:20:03 -07:00
Morris Jobke
be07e828ef Merge pull request #5648 from owncloud/files-fixhidecontrolsinviewermode 
Corretly hide "no permissions" message in controls in viewer mode
 2013-10-31 08:08:04 -07:00
Andreas Fischer
d6ddb12c20 Get rid of the SELECT query. Try UPDATE, on failure INSERT. 2013-10-31 16:04:18 +01:00
Jörn Friedrich Dreyer
adb5de4a88 prefer closest over parent 
closest will search up the tree
 2013-10-31 15:56:02 +01:00
Andreas Fischer
c40515c33f Merge pull request #5531 from owncloud/upgrade-form-occ 
Add `occ upgrade` command.

* owncloud/upgrade-form-occ:
  Add some color to the occ upgrade output.
  Use "else if" to remove one level of indentation.
  Missed one write()->writeln(). Fixed.
  Use writeln() instead of write()
  Use the OutputInterface for output and return error codes.
  Move all upgrade routines into the command-line tool.
  Add `occ upgrade` command.
 2013-10-31 15:30:35 +01:00
Jörn Friedrich Dreyer
a4be1ebeb8 use data-file to retrieve filename 
forward port of https://github.com/owncloud/core/pull/5647#discussion-diff-7341163
trust me, I know what I'm doing
 2013-10-31 14:31:57 +01:00
Jörn Friedrich Dreyer
10b2d649af extend unit test to directories starting or ending in whitespace 2013-10-31 14:24:43 +01:00
Vincent Petry
1be1c57bc8 Corretly hide "no permissions" message in controls in viewer mode 
Fixes #5622
 2013-10-31 12:34:15 +01:00
Morris Jobke
ea4dfa7e38 Merge pull request #5638 from owncloud/admin-quotafield 
Improve quota input field
 2013-10-31 04:25:42 -07:00
Morris Jobke
680f4963dc fix translation strings 2013-10-31 12:21:42 +01:00
Thomas Müller
cb0ce90d01 Adding link to documents repo 2013-10-31 11:16:56 +01:00
Thomas Müller
43d71aada8 testing update and delete 2013-10-31 11:09:52 +01:00
Vincent Petry
28fbc1b3cc Fixed input field and tipsy positioning in singleselect 
If the user scrolls or the window is resized, the formerly cached offset
was wrong. This fix makes sure the offset is re-read before showing the
input field.
 2013-10-31 10:50:18 +01:00
Thomas Müller
aae6e76926 fixing undefined index in delete() 2013-10-31 10:24:28 +01:00
Thomas Müller
bd5663bc3d adding unit tests for delete 2013-10-31 10:21:42 +01:00
Thomas Müller
64d0b0d184 PHPDoc comment updated - checkLoggedIn() removed 2013-10-31 10:21:17 +01:00
Thomas Müller
8362afa94d unit tests for set added 2013-10-31 10:14:31 +01:00
Thomas Müller
0cec17ba87 no need to check if the user is logged in 2013-10-31 10:14:06 +01:00
Thomas Müller
47da2ef8db fixing php notice: Undefined index key 2013-10-31 10:02:18 +01:00
Thomas Müller
7f64d858dd first two tests 2013-10-31 10:01:04 +01:00
Thomas Müller
b2929de0a7 no need to check if the user is logged in - this is already done in the ocs dispatcher itself 
adding @return
 2013-10-31 09:58:18 +01:00
Thomas Müller
64bfd21ccd Merge branch 'master' into fix_privatedata 2013-10-31 09:05:35 +01:00
VicDeo
8f50d7680b Merge pull request #5642 from owncloud/fixing-5271-master 
we should check if a user is logged in before we check for admin privil...
 2013-10-30 16:31:23 -07:00
Thomas Müller
3f42c890be we should check if a user is logged in before we check for admin privilege 2013-10-30 22:59:31 +01:00
Thomas Müller
77e4305841 Merge pull request #5634 from owncloud/admin-loglevellabels 
Changed log level labels in log level dropdown
 2013-10-30 14:39:40 -07:00
Thomas Müller
261cd87efa Merge branch 'master' into home-storage 2013-10-30 22:11:19 +01:00
Lukas Reschke
c1730d241c Merge pull request #5615 from owncloud/fixing-5614-master 
http header OCS-ApiRequest: true is required in case of session based OC...
 2013-10-30 13:12:16 -07:00