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

607 commits

Author SHA1 Message Date
Thomas Tanghus
aaed871cee Add factory class for the server container. 2013-09-24 17:10:01 +02:00
Arthur Schiwon
d101ff42f1 User: move checkPassword from User to Manager to not break API 2013-09-24 13:46:30 +02:00
Thomas Müller
cd2421c7ee adding PHPDoc comments to getBackend 
ensure getChildren() is called on an instance of Share_Backend_Collection
 2013-09-24 10:37:58 +02:00
Thomas Tanghus
8c469394e6 Remove duplicate method definitions 2013-09-24 00:12:23 +02:00
Thomas Tanghus
698394c994 Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods 
Conflicts:
	lib/public/iservercontainer.php
	lib/server.php
 2013-09-24 00:09:21 +02:00
Thomas Tanghus
4d3e7fa78a Add getUserFolder/getAppFolder to Server. 2013-09-23 23:57:39 +02:00
Thomas Tanghus
1bbeb12e2e Updated method names and added a few more tests. 2013-09-23 23:39:36 +02:00
Thomas Tanghus
45f73feb69 OC_VCategories=>OC\Tags. Public interface + getter in server container 2013-09-23 23:39:36 +02:00
Andreas Fischer
437858852c Merge pull request #4856 from owncloud/fix-link-expiration 
Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)

* owncloud/fix-link-expiration:
  Perform expiration date checking before returning share data for token.
  Tests whether expired/valid link share is still accessible.
 2013-09-23 15:12:38 +02:00
Bjoern Schiessle
fc76a13c52 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/public/share.php
 2013-09-23 11:18:00 +02:00
Bart Visscher
0c6dcdba6b Add missing implements and fix parameters in IConfig 2013-09-20 22:45:22 +02:00
Thomas Müller
f83f323269 fixing typos + adding missing filed $activeEntry 2013-09-20 21:45:27 +02:00
Thomas Müller
e31f6c01e8 fixing PHPDoc 2013-09-20 21:43:17 +02:00
Thomas Müller
9116303cfc fixing typos 2013-09-20 21:40:54 +02:00
Bart Visscher
e92abfd4d8 Add Config container class to server container 2013-09-20 20:21:24 +02:00
Bart Visscher
e3013c5801 Add Navigation class to server container 2013-09-20 20:20:01 +02:00
Thomas Müller
1b59003d6d adding basic interfaces for the activities api 2013-09-20 16:37:52 +02:00
Bart Visscher
aa8a85f77d Add DBConnection to server container 2013-09-20 14:33:45 +02:00
Bart Visscher
ac73ce1b2a Add UserSession to server container 2013-09-20 14:32:43 +02:00
Bjoern Schiessle
944e9b8c69 make sure that both $permissions and $oldPermissions have the same type 2013-09-20 12:40:21 +02:00
Jörn Friedrich Dreyer
e8bf576184 add initial search in shared files 2013-09-19 21:08:32 +03:00
Thomas Tanghus
d5126dd6b4 Merge branch 'appframework-master' into server_folder_methods 2013-09-19 12:32:32 +02:00
Thomas Müller
1274d6116d updating php docs 2013-09-18 22:22:51 +02:00
Thomas Tanghus
dd62ccdb4e Merge branch 'appframework-master' into public_cache 
Conflicts:
	lib/public/iservercontainer.php
	lib/server.php
 2013-09-18 13:20:07 +02:00
Thomas Tanghus
6ba23912a7 Add getUserFolder/getAppFolder to Server. 2013-09-18 12:34:10 +02:00
Thomas Tanghus
d3f88ceeb4 Add some docs to the sessions interface. 2013-09-18 12:01:01 +02:00
Bjoern Schiessle
1a60aa2b6a only remember password if the user changes the permissions, otherwise the user disabled the password protection 2013-09-18 11:49:02 +02:00
Thomas Tanghus
5bddb5377a Purge session from Request - and fix some styles 2013-09-17 18:38:18 +02:00
Thomas Tanghus
5c19b995db Add interface for Session and add getter in server container. 2013-09-17 18:31:14 +02:00
Thomas Tanghus
fe86182dac OC_Cache namespace changes and add UserCache to server container. 
Refs #4863
 2013-09-17 17:46:33 +02:00
Thomas Müller
b9e943f5d5 fix naming 2013-09-17 09:42:14 +02:00
Thomas Müller
4cd0ee47a8 Merge branch 'master' into appframework-master 2013-09-17 09:39:45 +02:00
Thomas Müller
822daa8f8a class files have to be lowercase 2013-09-17 00:27:22 +02:00
Thomas Müller
981a41e2cd adding interface for middleware 2013-09-17 00:26:55 +02:00
Andreas Fischer
a92d4c2c09 Perform expiration date checking before returning share data for token. 2013-09-16 21:24:17 +02:00
Bjoern Schiessle
534d93d2d3 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	apps/files/index.php
 2013-09-16 10:40:06 +02:00
Thomas Tanghus
eab84d3d96 Add OCP\DB::getErrorMessage() to public namespace. 2013-09-16 02:17:39 +02:00
Thomas Müller
af0069bf03 adding getRootFolder() to server container and hooking up the new files api 2013-09-15 22:24:57 +02:00
Thomas Müller
4480b0b164 Merge branch 'master' into appframework-master 2013-09-13 23:31:59 +02:00
Thomas Müller
4da8fc6907 Merge branch 'appframework-master' of github.com:owncloud/core into appframework-master 2013-09-13 20:57:18 +02:00
Thomas Müller
5b3388c7c4 Merge branch 'master' into appframework-master 2013-09-13 20:56:49 +02:00
Robin Appelman
58ed78aa9e cleanup public storage interface a bit 2013-09-12 21:58:32 +02:00
Robin Appelman
c9d2663159 Merge branch 'master' into fileapi-foreward 2013-09-12 21:43:35 +02:00
Robin Appelman
2e5ce091f0 add storage backend interface to public namespace 2013-09-10 20:13:47 +02:00
Robin Appelman
9ad7891b4e improve phpdoc for the public files interface 2013-09-10 20:10:25 +02:00
Robin Appelman
e271a55783 move filesystem expceptions to global namespace 2013-09-10 19:44:23 +02:00
Robin Appelman
315344eb9c move public files api to a clearer namespace 2013-09-10 19:34:38 +02:00
Robin Appelman
2e1b534957 update phpdoc for public fileapi 2013-09-06 20:55:47 +02:00
Robin Appelman
0131a32025 extract interfaces from fileapi for public namespace 2013-09-06 20:38:59 +02:00
Bjoern Schiessle
b8241aa79d remove some more debug output 2013-09-06 16:07:54 +02:00
Bjoern Schiessle
edb78c917c remove some error_logs 2013-09-06 16:07:45 +02:00
Bjoern Schiessle
d33fabd02d remove error logs 2013-09-06 16:07:25 +02:00
Bjoern Schiessle
627b6164c4 if the files doesn't exist yet we start with the parent to search for shares 2013-09-06 16:07:07 +02:00
Bjoern Schiessle
f8563ec583 Merge branch 'master' into sharing_mail_notification_master 
increased version number to trigger db update

Conflicts:
	lib/util.php
 2013-09-05 13:39:45 +02:00
Thomas Müller
7618cf3005 adding public interface for preview 2013-09-04 23:45:11 +02:00
Thomas Müller
835f477d8f Merge branch 'master' into appframework-master 2013-09-04 23:15:17 +02:00
Bjoern Schiessle
931e90634e fix db queries 2013-09-02 17:03:35 +02:00
Bjoern Schiessle
983da0d78f fix db queries 2013-09-02 17:01:10 +02:00
Bjoern Schiessle
b918c06be6 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	lib/util.php
 2013-09-02 14:41:46 +02:00
kondou
e5fc7b9dbe Merge branch 'master' into clean_up_util 
Conflicts:
	lib/base.php
 2013-09-02 07:58:06 +02:00
Frank Karlitschek
c54994d2e9 fixing this obvious typo directly 2013-09-01 08:23:11 +02:00
Thomas Müller
206f83941b move new interfaces into lib/public and OCP 2013-08-31 21:34:29 +02:00
Thomas Müller
97bdf008b1 PHPDoc added to existing interfaces 2013-08-31 20:57:16 +02:00
Thomas Müller
ec9b7d1e84 fixing file header 2013-08-31 01:41:24 +02:00
Bjoern Schiessle
4bbefdf608 add expiration date if it is already set 2013-08-30 17:20:10 +02:00
Bjoern Schiessle
10cf1b3a4e return mailSend status in getItems() 2013-08-30 15:39:43 +02:00
Bjoern Schiessle
77adaee645 enable user to inform recipients about a shared file by mail 2013-08-30 13:53:49 +02:00
Thomas Müller
14b67d6c5f fixing typo 2013-08-29 16:25:25 +02:00
Thomas Müller
21fd352c1a as a quick example the public contacts API has been ported over as a service hosted within the server container 2013-08-26 23:48:18 +02:00
Thomas Müller
a995e81686 Merge branch 'master' into appframework-master 2013-08-26 21:31:15 +02:00
Georg Ehrke
6ffa2a28d0 Merge branch 'master' into oc_preview 2013-08-23 23:10:37 +02:00
Arthur Schiwon
958130e8fe Sharing: only determine path root if owner is available 2013-08-22 00:00:40 +02:00
Thomas Müller
38f9df4293 introducing OCP\AppFramework\App 2013-08-21 01:02:15 +02:00
Thomas Müller
911bd3c16f moving response classes over to OCP 2013-08-21 01:00:26 +02:00
Thomas Müller
e39083c36f typo 2013-08-21 00:58:33 +02:00
Thomas Müller
ba029ef4b2 initial setup of the server container 2013-08-21 00:58:15 +02:00
Thomas Müller
f115b94927 Introducing IRequest 2013-08-20 17:53:58 +02:00
Thomas Müller
6e1946ab00 Introducing IContainer into public api 2013-08-20 17:22:33 +02:00
kondou
f1518a54df Merge branch 'master' into clean_up_util 
Conflicts:
	lib/util.php
 2013-08-20 17:20:30 +02:00
Georg Ehrke
f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Björn Schießle
9be836814c Merge pull request #4239 from owncloud/decrypt_files_again 
Enable user to decrypt files again after encryption app was disabled
 2013-08-18 09:51:48 -07:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Bjoern Schiessle
cabe92ef12 Merge branch 'master' into decrypt_files_again 
Conflicts:
	apps/files_encryption/tests/keymanager.php
 2013-08-17 13:15:22 +02:00
kondou
9c5416fe4a Clean up \OC\Util 
- Use camelCase

 - Add some phpdoc

 - Fix some indents

 - Use some more spacing
 2013-08-15 15:57:32 +02:00
Bjoern Schiessle
53bb89824d check if some encrypted files are left after the app was disabled and warn the user 2013-08-12 17:25:27 +02:00
Georg Ehrke
af983b843d fix merge conflicts 2013-08-05 14:27:38 +02:00
Bjoern Schiessle
9253627327 cancel sharing if some users doesn't have a working encryption set-up. 2013-08-01 13:04:55 +02:00
Thomas Müller
17c36b5074 fixes #4026 2013-07-30 10:26:42 +02:00
Thomas Müller
7425efade7 Merge branch 'master' into oc_preview 
Conflicts:
	3rdparty
	lib/template.php
 2013-07-30 00:34:36 +02:00
Georg Ehrke
1e4ec2ac27 add class='preview-icon' to rows in file app that make use of previews 2013-07-29 15:47:17 +02:00
Robin Appelman
1b50154c95 functions in OCP should be static 2013-07-25 15:25:17 +02:00
Jörn Friedrich Dreyer
cb4cf3e2f7 need to use \OC_Image to escape OCP namespace 2013-07-22 17:25:55 +02:00
Robin Appelman
d509a0c403 return result from getL10N 2013-07-22 15:52:02 +02:00
Bart Visscher
9bf12da750 Merge pull request #3880 from owncloud/code-checker 
Add classes replaced by the public api to the code checker
 2013-07-21 11:19:20 -07:00
Morris Jobke
05c83a163a add proper deprecated tag 2013-07-21 10:30:00 +02:00
Jan-Christoph Borchardt
48267b6e6c add back public API function, but mark as deprecated 2013-07-20 01:15:12 +02:00
Bart Visscher
cbe1c22b5f Correct casing of OC_User and pass through the params to getUsers 2013-07-19 17:32:31 +02:00
Bart Visscher
a22940d3cd Add OC_L10N to public api 2013-07-19 11:40:11 +02:00
Bart Visscher
9379cbf602 Add OC_Image to public api 2013-07-19 11:23:47 +02:00
Jan-Christoph Borchardt
48948ccf5f finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry. 2013-07-18 22:15:26 +02:00
icewind1991
3abe68176f Merge pull request #3270 from owncloud/convert-oc_config 
Convert OC_Config to object so it can be used for DI
 2013-07-11 18:21:08 -07:00
Georg Ehrke
53830f2f75 implement use of previews in sharing app 2013-07-11 11:58:52 +02:00
Georg Ehrke
a357e5b284 merge conflicts ... 2013-07-10 12:41:53 +02:00
Victor Dubiniuk
5a3fce12a4 Implement encodePath 2013-07-09 17:46:11 +03:00
Michael Gapczynski
4feff3456b Only emit permissions hook for files and and include path 2013-07-08 17:28:18 -04:00
Bart Visscher
52553c64ed Merge branch 'master' into convert-oc_config 
Conflicts:
	lib/config.php
 2013-07-08 17:59:50 +02:00
Michael Gapczynski
5c2a0325ba Add update permissions hook to sharing 2013-07-08 11:40:10 -04:00
Thomas Müller
98da4bf704 removing unused getSharedItem() 2013-07-06 00:04:01 +02:00
Thomas Müller
dad91c156f Merge branch 'master' into fixing-3942-master 
Conflicts:
	apps/files/ajax/upload.php
 2013-07-06 00:02:11 +02:00
Thomas Müller
e159cbf527 on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function 2013-07-05 17:39:41 +02:00
Thomas Müller
352c1415be proper fix for getting the shared item if no user is logged in 2013-07-05 13:45:21 +02:00
Bart Visscher
ad9458e85d Merge branch 'master' into convert-oc_config 
Conflicts:
	lib/config.php
 2013-07-04 18:23:47 +02:00
Björn Schießle
6cfa016c39 add public api 2013-07-04 10:11:55 +02:00
Thomas Müller
bb07dde988 Merge branch 'master' into convert-oc_config 2013-07-01 23:43:00 +02:00
Jörn Friedrich Dreyer
f3c4a37a78 Merge pull request #3832 from owncloud/oracle_sql_fixes 
for oracle use BITAND() instead of & in sharing permissions sql
 2013-06-28 10:22:59 -07:00
Bart Visscher
6ad7a0336f Oracle doesn't know & as bitwise AND 
Conflicts:
	lib/public/share.php
 2013-06-28 15:48:49 +02:00
Bart Visscher
c6bbccc776 Merge branch 'master' into convert-oc_config 
Conflicts:
	lib/config.php
	lib/setup.php
 2013-06-27 17:54:17 +02:00
Jörn Friedrich Dreyer
5d51118cb2 fix type of numeric columns 2013-06-26 20:03:24 +02:00
Jörn Friedrich Dreyer
bf49edde6b check item id is set 2013-06-26 19:57:28 +02:00
Georg Ehrke
39c387eed4 implement server side use of previews 2013-06-26 18:04:22 +02:00
Jörn Friedrich Dreyer
b32d6d8487 for oracle use BITAND() instead of & in sharing permissions sql 2013-06-24 22:52:01 +02:00
Georg Ehrke
1a933a9173 Merge branch 'master' into oc_preview 2013-06-17 12:31:02 +02:00
Jörn Friedrich Dreyer
961a001af3 add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup 2013-06-14 12:18:20 +02:00
Jörn Friedrich Dreyer
124f34422c add missing backticks all over the place 2013-06-10 09:53:29 +02:00
Georg Ehrke
85ecec8b01 Merge branch 'master' into oc_preview 2013-06-06 11:13:55 +02:00
Michael Gapczynski
1c61732193 Merge branch 'master' into convert-oc_config 2013-06-03 18:06:13 -04:00
Jörn Friedrich Dreyer
96b1e54d4a Merge pull request #3444 from owncloud/share-fix 
Fix undefined index for share mount point retrieval
 2013-06-03 11:35:06 -07:00
Robin Appelman
251527c6e6 merge master into backgroundjob 2013-06-02 20:12:44 +02:00
Florin Peter
1337f48d64 fixes for pgsql 2013-05-29 20:41:07 +02:00
Florin Peter
f1b884aa5d changed deprecated class 2013-05-29 20:15:04 +02:00
Florin Peter
353d19d183 fixes if cache returns false 2013-05-29 20:11:13 +02:00
Florin Peter
c8d1cd224d fix $parent/$source typo 2013-05-29 19:58:05 +02:00
Björn Schießle
ae0f37e9e2 fix indention 2013-05-29 15:37:27 +02:00
Björn Schießle
8587f565d2 remove unnecessary variable 2013-05-29 15:14:15 +02:00
Björn Schießle
63a2bec6e5 use public API for error handling; improved while condition 2013-05-29 14:40:47 +02:00
Björn Schießle
893a1ed6f5 for external storages we never reach the path 'files', instead we need to leave the loop if no further parent exists 2013-05-29 14:19:18 +02:00
Björn Schießle
672811c103 if one public link share was found, we don't have to check it for the other folders 2013-05-29 13:12:30 +02:00
Björn Schießle
b44192f366 check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages 2013-05-29 13:10:26 +02:00
Georg Ehrke
af57996d1e Merge branch 'master' into oc_preview 2013-05-25 12:16:25 +02:00
Michael Gapczynski
7a0c592f93 Fix undefined index for share mount point retrieval 2013-05-21 20:21:19 -04:00
Georg Ehrke
0305ee50c5 Merge branch 'master' into oc_preview 2013-05-17 11:41:30 +02:00
Florin Peter
d7dc710c8b revert changes 2013-05-17 01:22:30 +02:00
Björn Schießle
95297c2469 add pre-shared hooks 2013-05-16 17:44:28 +02:00
Florin Peter
0916769f67 fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup 2013-05-15 17:00:01 +02:00
Florin Peter
751487ded7 merge changes for files_encryption 2013-05-15 10:20:19 +02:00
Florin Peter
226aec8d56 Merge branch 'master' into files_encryption 2013-05-15 03:22:06 +02:00
Bart Visscher
e620286b25 Fix returns of values in OCP\Config 2013-05-07 20:07:28 +02:00
Robin Appelman
b7585050b5 Move legacy backgroundjob classes to a place where they can be autoloaded 2013-05-03 16:42:48 +02:00
Michael Gapczynski
73d7cae6df One more mount point fix 2013-05-02 18:22:43 -04:00
Robin Appelman
809b5f81f6 Further seperation of mount management logic 2013-04-26 00:01:36 +02:00