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

13851 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
3dd19c7758 Merge pull request #4999 from owncloud/run-unit-tests-for-apps-master 
run unit tests for apps as well
 2013-09-26 07:09:32 -07:00
Thomas Müller
f8933eaf92 Remove $RUNTIME_NOAPPS - setting to false was not enough 2013-09-26 14:03:04 +02:00
Thomas Müller
e515509a81 prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded 2013-09-26 13:34:47 +02:00
blizzz
b9d582caa2 Merge pull request #4990 from owncloud/user_fix_manager 
manager checkPassword now returns User object, adjust internal user clas...
 2013-09-26 04:03:20 -07:00
Björn Schießle
6b1d70f148 Merge pull request #4887 from owncloud/sharing_disable_public_upload 
check only permission from link-share to decide if public upload is enabled or disabled
 2013-09-26 03:16:15 -07:00
Thomas Müller
2334f96906 Merge pull request #4991 from owncloud/enc_fix_warning 
check if key exists before reading it
 2013-09-26 03:15:14 -07:00
Thomas Müller
d1b5d65622 run unit tests for apps as well 2013-09-26 12:02:06 +02:00
Thomas Müller
b11d8799c1 adding unit tests for ObjectTree::move() 2013-09-26 10:50:15 +02:00
Thomas Müller
469b309b21 Merge pull request #4892 from owncloud/vcategories_public 
OC_VCategories => OC\Tags. Public interface and getter in server container
 2013-09-25 14:24:37 -07:00
Bjoern Schiessle
0b98427536 fix check if app is enabled 2013-09-25 19:23:07 +02:00
Arthur Schiwon
b5ac672864 Missing Test for the previous commit 2013-09-25 19:15:27 +02:00
Morris Jobke
70dccd28ef Merge pull request #4987 from owncloud/different_color_placeholder 
Make it possible to have a different color than the username for placeholder
 2013-09-25 10:11:52 -07:00
Bjoern Schiessle
71bbb2ea8b check if key exists before reading it 2013-09-25 17:44:05 +02:00
Thomas Müller
46e47be782 Merge branch 'master' into move-aborted-upload-detection-into-plugin-master 2013-09-25 17:43:25 +02:00
Thomas Müller
826c6bec8f expect unlinkto be called 2013-09-25 17:41:16 +02:00
Thomas Müller
3fa5271f10 adding unit tests 2013-09-25 17:34:28 +02:00
Thomas Müller
0c44cdd4ea remove unneccessary code 2013-09-25 17:28:45 +02:00
kondou
5e7a7b3f61 Shorten optional text-argument processing 2013-09-25 17:19:38 +02:00
Thomas Müller
5e27ac4b1a $path already contains the full path to the file 2013-09-25 17:17:29 +02:00
Thomas Müller
09b64535a9 fixing copyright and add class documentation 2013-09-25 17:05:14 +02:00
Thomas Müller
2feb753b84 Merge pull request #4989 from owncloud/coverage-for-all-master 
collect coverage for all databases again - ci.owncloud.org has more RAM ...
 2013-09-25 07:46:49 -07:00
Arthur Schiwon
1c976a7c9b manager checkPassword now returns User object, adjust internal user class accordingly. 2013-09-25 15:03:22 +02:00
Thomas Müller
0486dc24ad collect coverage for all databases again - ci.owncloud.org has more RAM available 2013-09-25 14:41:13 +02:00
Thomas Müller
68bfcfbf77 Merge pull request #4968 from owncloud/user_checkpwd 
User: move checkPassword from User to Manager to not break API
 2013-09-25 05:28:42 -07:00
kondou
24eb41548e Make it possible to have a different color than the username for placeholder 2013-09-25 12:57:41 +02:00
Thomas Müller
30286c06ab stripos return value check 2013-09-25 11:05:59 +02:00
Thomas Müller
b168d5aa3b class API decommissioning part 1 2013-09-25 11:05:24 +02:00
Thomas Müller
b2ef978d10 AppFramework: 
- get request from the server container
- implement registerMiddleWare()
- adding getAppName() to app container
 2013-09-25 10:30:48 +02:00
Georg Ehrke
9e4fe10329 add test for txt blacklist 2013-09-25 10:20:40 +02:00
Thomas Müller
db39fede97 Merge branch 'master' into appframework-master 
Conflicts:
	apps/files/lib/helper.php
	apps/files_trashbin/lib/helper.php
 2013-09-25 09:52:12 +02:00
Jenkins for ownCloud
2d12e52769 [tx-robot] updated from transifex 2013-09-24 12:59:48 -04:00
Bjoern Schiessle
c486fc7608 introduce OC_Util::rememberLoginAllowed() 2013-09-24 18:01:34 +02:00
Thomas Tanghus
aaed871cee Add factory class for the server container. 2013-09-24 17:10:01 +02:00
Arthur Schiwon
14a160e176 Adjust Tests and satisfy them 2013-09-24 17:10:01 +02:00
Thomas Müller
843f15f348 Merge pull request #4898 from owncloud/server_folder_methods 
Server folder methods
 2013-09-24 06:58:47 -07:00
Arthur Schiwon
63324e2347 Fix doc 2013-09-24 14:12:44 +02:00
Arthur Schiwon
0a7ee7c3f7 Fix return value from User object to User ID 2013-09-24 14:11:47 +02:00
Thomas Müller
e9eb34f187 duplicate code :sigh: - will fix this in a second pr 2013-09-24 13:54:18 +02:00
Thomas Müller
6c5466a540 adding file_exists check just to be on the save side 2013-09-24 13:53:32 +02:00
Arthur Schiwon
fe88a62d6e === not == 2013-09-24 13:51:33 +02:00
Arthur Schiwon
d101ff42f1 User: move checkPassword from User to Manager to not break API 2013-09-24 13:46:30 +02:00
Christopher
e41ef97ac0 Merge pull request #4963 from cyberb/patch-1 
fixing typo
 2013-09-24 04:45:13 -07:00
Georg Ehrke
52f1d5856d add test data for cal and contact preview 2013-09-24 13:26:51 +02:00
Thomas Müller
ee1f627155 adding privilege check on move and rename operations 2013-09-24 13:26:12 +02:00
Bjoern Schiessle
b693b5085c don't remember login if the encrypion app is enabled because the user 
needs to log-in again in order to decrypt his private key with his password
 2013-09-24 13:08:55 +02:00
Georg Ehrke
31d2048eb8 add blacklist to txt preview backend 2013-09-24 11:00:08 +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 Müller
40871bab88 Merge pull request #4930 from owncloud/fix-apps-settings 
Fix the apps enabling/disabling in settings
 2013-09-24 01:02:50 -07:00
Thomas Müller
759f732aaa Merge pull request #4917 from owncloud/scan-clear-permissions 
clear permissions cache when scanning a file
 2013-09-24 00:50:33 -07:00
Boris Rybalkin
00c998c5bb fixing typo 
Typo in comment "feature" => "future"
 2013-09-23 21:08:58 -04:00