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

9435 commits

Author SHA1 Message Date
Jenkins for ownCloud
6a3f69c2d0 [tx-robot] updated from transifex 2015-01-06 01:54:59 -05:00
Morris Jobke
28c8f5a0f9 Check for version before mounting a public link 
* ownCloud 7.0.0 is needed - version of merge of server <-> server
  sharing - https://github.com/owncloud/core/pull/8399
* adjust error message
 2015-01-05 11:50:05 +01:00
Lukas Reschke
a0023974e3 Merge pull request #13099 from owncloud/fix-provisioning-api 
Remove unnecessary setUp method from provisioning_api
 2015-01-05 10:35:24 +01:00
Jenkins for ownCloud
8776271103 [tx-robot] updated from transifex 2015-01-05 01:54:36 -05:00
Tom Needham
f17f0ade7f Remove unnecessary setUp method 2015-01-04 23:10:44 +00:00
Jenkins for ownCloud
84ed1034b4 [tx-robot] updated from transifex 2015-01-04 01:54:53 -05:00
Morris Jobke
fcae87170d Merge pull request #13091 from owncloud/fix-provisioning-api 
Fix remaining unit tests for provisioning_api
 2015-01-03 22:41:44 +01:00
Tom Needham
a20de1548d Add proper group setup and teardown to all provisioning_api tests 2015-01-03 15:58:36 +00:00
Tom Needham
5c0d7f2ee5 Create admin group before running provisioning_api tests 2015-01-03 15:39:42 +00:00
Tom Needham
97d31946c3 Ensure admin group is present before running tests 2015-01-03 13:25:48 +00:00
Morris Jobke
92f062baac Merge pull request #13082 from mmattel/rename_text_no_external_storages 
adopt text "no external storage configured"
 2015-01-03 11:59:22 +01:00
Jenkins for ownCloud
05ffa3ab7a [tx-robot] updated from transifex 2015-01-03 01:54:29 -05:00
root
c44d41178a adopt text "no ecternal storage configured" 
storage -> storages
 2015-01-02 21:00:02 +01:00
Tom Needham
32d9563359 Change array element order to fix failing test 2015-01-02 19:07:31 +00:00
Tom Needham
a4f270a9ce Add placeholder app.php for provisioning_api so app is detected 2015-01-02 18:52:11 +00:00
Jenkins for ownCloud
4b357274bb [tx-robot] updated from transifex 2015-01-02 01:54:28 -05:00
Jenkins for ownCloud
ec6e70889a [tx-robot] updated from transifex 2015-01-01 01:54:30 -05:00
Jenkins for ownCloud
573be9092d [tx-robot] updated from transifex 2014-12-31 01:54:33 -05:00
Jenkins for ownCloud
c8e946f633 [tx-robot] updated from transifex 2014-12-29 01:54:27 -05:00
Thomas Müller
9f327457dc Merge pull request #13023 from owncloud/provisioning_api-2 
[jenkins] Add provisioning_api app
 2014-12-28 14:29:49 +01:00
Thomas Müller
85e02460c8 Merge pull request #13025 from lyonel/master 
user_ldap is too verbose by default
 2014-12-27 21:39:23 +01:00
Thomas Müller
688a4022df Merge pull request #13012 from owncloud/small_fix 
only send activity if we have a valid path and the file is readable
 2014-12-27 21:38:47 +01:00
Jenkins for ownCloud
d2e53d1022 [tx-robot] updated from transifex 2014-12-27 01:54:33 -05:00
Jenkins for ownCloud
0836ce9cd8 [tx-robot] updated from transifex 2014-12-26 01:54:28 -05:00
Jenkins for ownCloud
e0fc26a5cb [tx-robot] updated from transifex 2014-12-25 01:54:29 -05:00
Tom Needham
dc85c20b18 Add provisioning_api app 
enable unit tests for provisioning api

fix admin docu key
 2014-12-24 22:15:20 +01:00
Lyonel Vincent
f94b300602 Be less verbose when using a paged search 
Lower the priority from INFO to DEBUG
 2014-12-24 16:35:36 +01:00
Lyonel Vincent
5a00b33a90 Be less verbose when disabling SSL cert validation 
change log level from WARN to DEBUG
 2014-12-24 16:32:27 +01:00
Jenkins for ownCloud
801b9e0494 [tx-robot] updated from transifex 2014-12-24 01:54:33 -05:00
Bjoern Schiessle
8c48be453e only send activity if we have a valid path and the file is readable 2014-12-23 13:32:54 +01:00
Morris Jobke
5352b4b2b8 Merge pull request #10292 from owncloud/external-share-delete 
Fix trashbin when deleting a file over an external share
 2014-12-23 11:21:06 +01:00
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
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
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
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
Jenkins for ownCloud
92c8cd3933 [tx-robot] updated from transifex 2014-12-22 01:54:49 -05: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
Jenkins for ownCloud
5a54ca380d [tx-robot] updated from transifex 2014-12-20 01:56:24 -05: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
Bjoern Schiessle
aea991c22e cache keys to read them only once from the hard disc 2014-12-19 16:04:13 +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
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
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
b32dc3f2a4 Merge pull request #12906 from owncloud/keyboardnav-feedback 
Accessibility: Keyboard navigation feedback
 2014-12-19 09:54:28 +01:00