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

29570 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
7ba715d144 fix test 2016-01-18 12:08:58 +01:00
Robin Appelman
7e01f32c27 Pass the user when updating external storage status 2016-01-18 11:10:41 +01:00
Robin McCorkell
3fe802d931 Introduce 'login credentials' auth mechanism 
Stores user credentials in the database after user login, uses the new
CredentialsManager class
 2016-01-18 11:10:41 +01:00
Robin McCorkell
da4127d23b Introduce CredentialsManager for storage of credentials in DB 
CredentialsManager performs a simple role, of storing and retrieving
encrypted credentials from the database. Credentials are stored by user
ID (which may be null) and credentials identifier. Credentials
themselves may be of any type that can be JSON encoded.

The rationale behind this is to avoid further (mis)use of
oc_preferences, which was being used for all manner of data not related
to user preferences.
 2016-01-18 11:10:41 +01:00
Robin McCorkell
88cd615214 Introduce IDBConnection::setValues() 
setValues() attempts to insert a new row, or failing that, update an
existing row. The ability to set preconditions is also available.
 2016-01-18 11:10:41 +01:00
Jenkins for ownCloud
e4d5229940 [tx-robot] updated from transifex 2016-01-18 01:54:41 -05:00
Thomas Müller
c8ab0942bf Merge pull request #21759 from owncloud/symfony-console-2.8.1 
[3rdparty] Bump symfony/console to 2.8.1
 2016-01-17 14:28:15 +01:00
Roeland Jago Douma
7f514d34b5 [3rdparty] Bump symfony/console to 2.8.1 2016-01-17 09:29:23 +01:00
Jenkins for ownCloud
2095a31000 [tx-robot] updated from transifex 2016-01-17 01:54:53 -05:00
Roeland Douma
3bf43f5b38 Merge pull request #20882 from owncloud/backbone-webdav 
Backbone transport for Webdav
 2016-01-16 13:54:21 +01:00
Vincent Petry
857c316bda Backbone transport for Webdav 2016-01-16 11:28:04 +01:00
Jenkins for ownCloud
7a239b2642 [tx-robot] updated from transifex 2016-01-16 01:55:18 -05:00
Thomas Müller
b46963f739 Merge pull request #21753 from owncloud/add-question-about-code-signing-status 
Add question about code signing status
 2016-01-15 20:16:41 +01:00
Thomas Müller
3a9dbc88ec Merge pull request #21739 from owncloud/issue_21110 
Fix bug issue 21110
 2016-01-15 20:15:03 +01:00
Thomas Müller
807cf750b3 Merge pull request #21705 from owncloud/improve-background-job-message 
Improve background job error message
 2016-01-15 20:12:26 +01:00
Lukas Reschke
daa05218c2 Add question about code signing status 
Let's ask the users to paste the signing status of their ownCloud instance. I went this way instead of simply asking "Has your instance passed code signing?" as a lot of users would probably simply answer "Yes" here.

If they paste the results of http://example.org/index.php/settings/integrity/failed the expected output is "No errors have been found.". Everything else indicates they tampered with their installation.
 2016-01-15 18:25:38 +01:00
Thomas Müller
f6c4b10189 Add message key to context of logException 2016-01-15 14:55:30 +01:00
Thomas Müller
fcec704174 Merge pull request #21730 from owncloud/fix-install-of-shipped-apps 
Fix installation of shipped apps
 2016-01-15 14:33:40 +01:00
Thomas Müller
b7c0dc46be Merge pull request #21702 from owncloud/fix_emit_scanFiles_II 
Fix: emit 'scanFiles' will only fire on files and not on folders (II)
 2016-01-15 14:31:49 +01:00
Thomas Müller
4cbed04273 Merge pull request #21370 from owncloud/system-certs-occ 
Add occ commands to manager trusted certificates
 2016-01-15 14:18:01 +01:00
Thomas Müller
6a7be4d277 Merge pull request #20927 from owncloud/handle-return-code-on-webdav-put 
Handle return code of streamCopy in WebDAV put
 2016-01-15 13:33:01 +01:00
Thomas Müller
6824704699 Merge pull request #21117 from owncloud/owner-file-exists 
Only return an owner if the file exists + improved getUidAndFilename
 2016-01-15 13:31:56 +01:00
Thomas Müller
41106c1967 Merge pull request #21543 from owncloud/Larzenegger-master 
[CI] Larzenegger master
 2016-01-15 13:29:57 +01:00
Thomas Müller
13ce6d0f1c Merge pull request #21544 from owncloud/trashbin-permissions 
set etag and permission fields for trashbin entries
 2016-01-15 13:22:54 +01:00
Jesús Macias
3ae928c661 Change icon only on WND and Sharepoint external storages 2016-01-15 13:06:12 +01:00
Thomas Müller
416fb65605 Merge pull request #21717 from owncloud/addpublicgroupinterface 
allow apps to add an OCP GroupInterface backend
 2016-01-15 12:38:18 +01:00
Thomas Müller
b37634a57d Merge pull request #21721 from owncloud/capped-memcache-indirect-set 
Allow indirect set in CappedMemoryCache
 2016-01-15 12:37:36 +01:00
Thomas Müller
d8867f7692 Merge pull request #21723 from owncloud/prevent-group-enable-for-apps 
Prevent group enable for apps
 2016-01-15 12:26:43 +01:00
Thomas Müller
64fb3c0606 Merge pull request #21735 from owncloud/files-external-checkbox-settings 
Consolidate user mounting check code
 2016-01-15 12:25:27 +01:00
Jesús Macias
5aa5d3a9ae Fis bug issue 21110 2016-01-15 12:13:16 +01:00
Thomas Müller
52040a3f23 Merge pull request #20898 from owncloud/cache-interfaces 
Public Cache interfaces
 2016-01-15 12:02:31 +01:00
Jenkins for ownCloud
cd840f01ae [tx-robot] updated from transifex 2016-01-15 01:54:57 -05:00
Robin McCorkell
4ffe8d70fa Consolidate user mounting check code 2016-01-14 22:13:28 +00:00
Thomas Müller
b48ddc94a9 Merge pull request #21727 from owncloud/adddispatchtousersettings 
allow apps to load additional scripts on the user settings page ...
 2016-01-14 17:42:31 +01:00
Thomas Müller
1d0724a772 Fixing CodeChecker usage 🙈 2016-01-14 17:35:28 +01:00
Thomas Müller
7d2a6d4c1a - isolate include calls in installer.php which prevents local variables to be overwritten 
- add the app to the autoloader before calling install.php
 2016-01-14 17:28:00 +01:00
Jörn Friedrich Dreyer
2d1b9a5f9f allow apps to load additional scripts on the user settings page via the event dispatcher 2016-01-14 16:57:33 +01:00
Thomas Müller
3f64d37f2a Merge pull request #21623 from owncloud/stricter_defaultprovider 
[Share 2.0] Default share provider should only query for supported types
 2016-01-14 16:12:06 +01:00
Thomas Müller
953c4bf18a Merge pull request #21714 from owncloud/groups-insertifnotexists 
Groups insertifnotexists
 2016-01-14 16:11:43 +01:00
Joas Schilling
e3a0858444 Check whether the app can be enabled for groups 2016-01-14 15:45:48 +01:00
Joas Schilling
0461b9dbb9 Add a new app type that can not be enabled for groups 2016-01-14 15:45:47 +01:00
Morris Jobke
1f0af76eb2 Merge pull request #21718 from owncloud/groupanduserinterface 
Groupanduserinterface
 2016-01-14 15:28:01 +01:00
Robin Appelman
d195584a32 Allow indirect set in CappedMemoryCache 2016-01-14 15:00:41 +01:00
Jörn Friedrich Dreyer
2ebb5726d7 add TODOs with the actual interface name 2016-01-14 14:34:35 +01:00
Jörn Friedrich Dreyer
64043e9bcc move methods to correct interface, deprecate private interface 2016-01-14 14:28:03 +01:00
Jörn Friedrich Dreyer
bd77cd98c9 allow apps to add an OCP GroupInterface backend 2016-01-14 13:58:45 +01:00
Thomas Müller
5036e4527f Use IDbConnectin::insertIfNotExist 2016-01-14 13:17:26 +01:00
Joas Schilling
436ce1f4a6 Use insertIfNotExists() when creating a group 2016-01-14 13:13:27 +01:00
Robin Appelman
7530f66f52 remove unneeded public cache methods 2016-01-14 13:01:46 +01:00
Robin Appelman
bdf51d9ea4 only trigger locking on lockingstorages 2016-01-14 13:01:43 +01:00