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

22044 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jenkins for ownCloud
d8f04f5a97 [tx-robot] updated from transifex 2014-12-23 01:55:23 -05:00
Björn Schießle
711220e82d Merge pull request #12997 from owncloud/sharing_activities 
add activity if public shared file/folder was downloaded
 2014-12-22 23:31:07 +01:00
Morris Jobke
bedc4664e4 Merge pull request #13003 from owncloud/remove-skip-to-content 
remove skip to content for now, see #12999
 2014-12-22 19:37:52 +01:00
Robin Appelman
3afcc71764 Make sure the path passed to the activity manager is normalized 2014-12-22 18:50:00 +01:00
Bjoern Schiessle
393deb5961 add activity if public shared file/folder was downloaded 2014-12-22 18:50:00 +01:00
Jan-Christoph Borchardt
6933ffbf83 remove skip to content for now, see #12999 2014-12-22 16:02:45 +01:00
Thomas Müller
cf595ecc67 Merge pull request #12860 from owncloud/remove-apparently-unused-file 
Remove unused file
 2014-12-22 14:47:14 +01:00
Thomas Müller
fe6f4a1404 Merge pull request #11810 from owncloud/hhvm-autotest 
Adding autotest-hhvm.sh [WIP]
 2014-12-22 14:12:03 +01:00
Morris Jobke
5d296aa6b1 Merge pull request #12969 from owncloud/clarify-docs 
Clarify return values
 2014-12-22 10:01:39 +01:00
Morris Jobke
eab4c029c2 Merge pull request #12961 from owncloud/try_to_cache_keys 
cache keys to read them only once from the hard disc
 2014-12-22 09:50:29 +01:00
Morris Jobke
c17b9ec068 Merge pull request #12983 from owncloud/root-iface 
Add an interface for the root folder so apps have an interface to deal with storage
 2014-12-22 09:05:23 +01:00
Jenkins for ownCloud
92c8cd3933 [tx-robot] updated from transifex 2014-12-22 01:54:49 -05:00
Bernhard Posselt
8e37214346 add an interface for the root folder so apps have an interface to deal with storage 
fix comments and newline

add newline
 2014-12-21 20:52:34 +01:00
Thomas Müller
dc12f5d9af Merge pull request #12978 from owncloud/fix-support-claim 
Change support message to be more explicit about the enterprise edition
 2014-12-21 20:30:43 +01:00
Thomas Müller
97a17e3ffe Merge pull request #12981 from owncloud/MDB2SchemaManager-tearDown-Oracle 
Properly call parent::tearDown() in MDB2SchemaManager::tearDown().
 2014-12-21 20:29:03 +01:00
Thomas Müller
c3544bd27e Merge pull request #12982 from owncloud/timefac-iface 
Add an interface for the timefactory class
 2014-12-21 20:27:53 +01:00
Morris Jobke
510488ad3e Merge pull request #12942 from owncloud/favs-missingsharedsubdirs 
Fix issues with searchByTag in shared storage
 2014-12-21 10:38:34 +01:00
Jenkins for ownCloud
312891c603 [tx-robot] updated from transifex 2014-12-21 01:54:36 -05:00
Bernhard Posselt
ba03b0b843 add an interface for the timefactory class 
fix indention
 2014-12-20 15:53:31 +01:00
Andreas Fischer
91e03f5845 Properly call parent::tearDown() in MDB2SchemaManager::tearDown(). 
The early return introduced by 04c982a96e
prevents parent::tearDown() being called on Oracle.
 2014-12-20 15:30:35 +01:00
Morris Jobke
79c9fc98a6 Merge pull request #12974 from owncloud/documents-typeface 
change Documents default typeface from serif to sans-serif
 2014-12-20 12:00:27 +01:00
Morris Jobke
5383d83f9e Change support message to be more explicit about the enterprise edition 2014-12-20 11:57:15 +01:00
Jenkins for ownCloud
5a54ca380d [tx-robot] updated from transifex 2014-12-20 01:56:24 -05:00
Tom Needham
fb7e4f6988 Merge pull request #12972 from owncloud/use-https-where-possible 
Link to HTTPS page
 2014-12-19 23:34:18 +00:00
derkostka
1c22b1f626 Fix Undefined variable: result at tags.php#231 
Fix app":"PHP","message":"Undefined variable: result at \/var\/www\/owncloud\/lib\/private\/tags.php#231" by moving the function call into the respective loop

Adjust indentation

Do it right - indentation

sorry, this is my first one
 2014-12-19 19:44:43 +01:00
Björn Schießle
8164415b45 Merge pull request #12749 from owncloud/server2server-sharing-ng 
server to server sharing next generation
 2014-12-19 19:04:44 +01:00
blizzz
ad6814f920 Merge pull request #12101 from owncloud/ldap_split_mapping 
Ldap split mapping from Access superclass
 2014-12-19 18:52:30 +01:00
Arthur Schiwon
ec0f80fee9 Split mapping from Access and Helper classes into it's own. Fully test them, too. 
remove unused methods

split mapping methods off from Access class

fix DB query handling

move 'clear mapping' methods from static helper to new mapping class

add tests

test directly with DB

finishing tests and fix return value from setDNbyUUID

add corresponding class for groups and make abstract test class neutral. helper tests is now obsolete as the tested functions were moved to the new mapper class.

add missing info to PHPDoc

add unmap method

fix namespaces

fix test inheritance

PHPDoc and a small code restructure for scrutinizer, no effective changes

PostgreSQL does not accept LIMIT in DELETE queries

phpdoc fixes, no code changes
 2014-12-19 18:26:12 +01:00
Jan-Christoph Borchardt
f512dbb98a change Documents default typeface from serif to sans-serif 2014-12-19 18:16:46 +01:00
Bjoern Schiessle
aea991c22e cache keys to read them only once from the hard disc 2014-12-19 16:04:13 +01:00
Lukas Reschke
b2ae95719d Link to HTTPS page 
Those domains are now accessible via HTTPS
 2014-12-19 15:53:56 +01:00
Bjoern Schiessle
24993280ed Next step in server-to-server sharing next generation, see #12285 
Beside some small improvements and bug fixes this will probably the final state for OC8.

To test this you need to set up two ownCloud instances. Let's say:

URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".

The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.

If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
 2014-12-19 15:20:24 +01:00
Lukas Reschke
f671b232cc Merge pull request #12923 from owncloud/ultra-slim-version-of-incognito-mode 
Add ultra-slim hack for incognito mode
 2014-12-19 14:54:11 +01:00
Lukas Reschke
dbbf568192 Fix typo 2014-12-19 14:36:00 +01:00
Lukas Reschke
a022e65285 Clarify return values 
This function returns `null` when no user is logged-in.
 2014-12-19 14:17:40 +01:00
Thomas Müller
2d64797320 Merge pull request #12956 from owncloud/jenkins-user-backend-names 
[jenkins only] introduce names for user backends - IUserBackend
 2014-12-19 13:15:50 +01:00
Morris Jobke
678642a6a2 Merge pull request #12935 from owncloud/public-tagsmanagerissue 
Only populate tags in main file list
 2014-12-19 12:48:20 +01:00
Lukas Reschke
87e3e29250 Also add secret 2014-12-19 10:57:46 +01:00
Lukas Reschke
157ff1219a Merge pull request #12954 from owncloud/hhvm-apc-clear 
HHVM: In APC cache clear, only request the cache key in APCIterator.
 2014-12-19 10:46:20 +01:00
Morris Jobke
6b3600d2bf Merge pull request #12918 from owncloud/use-uid-instead-of-login-name 
Return UID instead of login name
 2014-12-19 10:24:52 +01:00
Morris Jobke
6da33e1ea7 introduce names for user backends - IUserBackend 
* LDAP with multiple servers also proved backendName
 2014-12-19 10:17:17 +01:00
Thomas Müller
d44bf79b6d Merge pull request #12926 from owncloud/master-pear5 
Update 3rdparty submodule to restore PEAR5.php
 2014-12-19 09:58:29 +01:00
Thomas Müller
b32dc3f2a4 Merge pull request #12906 from owncloud/keyboardnav-feedback 
Accessibility: Keyboard navigation feedback
 2014-12-19 09:54:28 +01:00
Thomas Müller
995f01fa2a Merge pull request #12921 from owncloud/user-mail-user-management 
Mail address of users is now changable in the user management
 2014-12-19 09:51:18 +01:00
Jörn Friedrich Dreyer
587bdd9a74 Merge pull request #12948 from owncloud/wording 
Wording fixes for sharing dialog
 2014-12-19 09:48:19 +01:00
Morris Jobke
39d6ddd38a Merge pull request #12865 from owncloud/files-tags-webdav 
Returns tags through WebDAV
 2014-12-19 09:33:28 +01:00
Jenkins for ownCloud
028b0efd5c [tx-robot] updated from transifex 2014-12-19 01:56:51 -05:00
Andreas Fischer
0ba5c182f0 HHVM: In APC cache clear, only request the cache key in APCIterator. 
The default value of the $format parameter of the APCIterator constructur is
APC_ITER_ALL which instructs the iterator to provide all available information
on cache values being iterated over. Only the key value is necessary for
matching and deletion via apc_delete(), though.

This prevents a "Format values FILENAME, DEVICE, INODE, MD5, NUM_HITS, MTIME,
CTIME, DTIME, ATIME, REFCOUNT not supported yet." notice on HHVM.
 2014-12-19 03:24:00 +01:00
Andreas Fischer
48d6724a6f HHVM sets stream meta datum wrapper_type to 'File' instead of 'user-space'. 2014-12-19 00:58:37 +01:00
Jan-Christoph Borchardt
5a678a6350 proper feedback for breadcrumbs when tabbing with keyboard 2014-12-19 00:35:25 +01:00