summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18851 from owncloud/memcached-getallkeys-fallbackRobin McCorkell2015-09-102-0/+28
|\ | | | | Fallback to complete Memcached flush if getAllKeys fails
| * Fallback to complete Memcached flush if getAllKeys failsRobin McCorkell2015-09-052-0/+28
| | | | | | | | | | | | | | Newer Memcached's do not support the underlying protocol commands that getAllKeys() is implemented with. We should fallback to clearing everything in that case, as causing (temporary) performance problems for other applications on the server is better than having stale cached data.
* | Merge pull request #18699 from owncloud/notification-managerLukas Reschke2015-09-1024-3/+2662
|\ \ | | | | | | Notification manager
| * | Move interfaces to private until they are no longer experimentalJoas Schilling2015-09-0817-83/+74
| | |
| * | Add tests for the query()Joas Schilling2015-09-081-0/+2
| | |
| * | Add tests for the notification managerJoas Schilling2015-09-082-2/+360
| | |
| * | Add more action testsJoas Schilling2015-09-082-9/+12
| | |
| * | Add tests for notificationJoas Schilling2015-09-082-8/+610
| | |
| * | Add tests for ActionJoas Schilling2015-09-083-1/+235
| | |
| * | Fix the subject of notificationsJoas Schilling2015-09-082-2/+2
| | |
| * | Scrap the notifications when the share is accepted or declinedJoas Schilling2015-09-088-2/+33
| | |
| * | Add notifications for remote sharesJoas Schilling2015-09-083-0/+115
| | |
| * | Fix closures and adding parsed ActionsJoas Schilling2015-09-082-3/+3
| | |
| * | Fix the request type and the validityJoas Schilling2015-09-082-3/+4
| | |
| * | Allow getting the request typeJoas Schilling2015-09-082-0/+14
| | |
| * | Use an INotification to getCount() and markProcessed()Joas Schilling2015-09-082-18/+10
| | |
| * | Add the request type to the actionJoas Schilling2015-09-082-2/+11
| | |
| * | Add the app id to the markProcessed methodJoas Schilling2015-09-082-3/+5
| | |
| * | Handle InvalidArgumentException more gracefullyJoas Schilling2015-09-081-5/+10
| | |
| * | Add language to the preparation methodJoas Schilling2015-09-082-3/+5
| | |
| * | Nothing is set in stone here yetJoas Schilling2015-09-085-0/+20
| | |
| * | Notification APIJoas Schilling2015-09-0810-1/+1279
| | |
* | | Merge pull request #17791 from owncloud/make-eventsource-compatible-with-win10Lukas Reschke2015-09-101-0/+11
|\ \ \ | | | | | | | | Add custom CSP for Win 10 compatibility
| * | | Add custom CSP for Win 10 compatibilityLukas Reschke2015-07-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default content-security-policy of ownCloud forbids inline JavaScript for security reasons. IE starting on Windows 10 will however also obey the CSP which will break the event source fallback. As a workaround thus we set a custom policy which allows the execution of inline JavaScript. This fixes https://github.com/owncloud/core/issues/14286
* | | | Merge pull request #18948 from owncloud/easier-example-theme-defaults.phpLukas Reschke2015-09-101-30/+8
|\ \ \ \ | | | | | | | | | | [example theme] make it easier for non PHP people to understand what …
| * | | | [example theme] make it easier for non PHP people to understand what to changeMorris Jobke2015-09-101-30/+8
| | | | |
* | | | | Merge pull request #18936 from owncloud/do-not-include-refererMorris Jobke2015-09-103-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | Prevent referer from being sent
| * | | | Prevent referer from being sentLukas Reschke2015-09-093-0/+3
| | | | | | | | | | | | | | | | | | | | Nice hardening for enhanced privacy. Especially useful when using embedded viewers such as files_pdfviewer.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-1012-0/+30
| | | | |
* | | | | Merge pull request #18895 from owncloud/make-code-analyzers-happierMorris Jobke2015-09-093-24/+100
|\ \ \ \ \ | |/ / / / |/| | | | Add proper PHPDoc
| * | | | Add proper PHPDocLukas Reschke2015-09-083-24/+100
| | | | | | | | | | | | | | | | | | | | Makes my IDE happier when going through that file.
* | | | | Merge pull request #18873 from owncloud/enc_use_master_passwordLukas Reschke2015-09-0910-27/+472
|\ \ \ \ \ | | | | | | | | | | | | Allow admin to use a master key for all files
| * | | | | occ command to enable master keyBjoern Schiessle2015-09-083-0/+196
| | | | | |
| * | | | | enable usage of a master keyBjoern Schiessle2015-09-077-27/+276
| | | | | |
* | | | | | Merge pull request #18931 from owncloud/fix-files_sharing-breakageLukas Reschke2015-09-091-9/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Check if files_sharing is actually enabled before using it
| * | | | | | Check if files_sharing is actually enabled before using itRobin McCorkell2015-09-091-9/+11
| | | | | | |
* | | | | | | Merge pull request #18925 from owncloud/change-risky-testMorris Jobke2015-09-091-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Rename data provider to avoid risky test warning
| * | | | | | Rename data provider to avoid risky test warningLukas Reschke2015-09-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` 06:49:56 There was 1 risky test: 06:49:56 06:49:56 1) OC\AppFramework\Http\JSONResponseTest::testRenderProvider 06:49:56 This test did not perform any assertions ```
* | | | | | | Merge pull request #18913 from owncloud/put-in-single-field-for-speedLukas Reschke2015-09-094-35/+52
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Put session data in single field for speed
| * | | | | | Write to session in batch at the end of the requestLukas Reschke2015-09-093-17/+22
| | | | | | |
| * | | | | | Write session data to single keyLukas Reschke2015-09-092-20/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents decrypting values multiple times.
| * | | | | | Use md5 over the version file to prevent cyclyc dependencyLukas Reschke2015-09-091-3/+1
|/ / / / / /
* | | | | | Merge pull request #18684 from owncloud/explicit-upgrade-versionMorris Jobke2015-09-094-25/+94
|\ \ \ \ \ \ | | | | | | | | | | | | | | Explicit upgrade version + prevent downgrades
| * | | | | | Improved update version detection logicVincent Petry2015-08-311-7/+1
| | | | | | |
| * | | | | | Simplify comparison algoVincent Petry2015-08-311-15/+1
| | | | | | |
| * | | | | | Throw exception on downgrade attemptVincent Petry2015-08-301-1/+5
| | | | | | |
| * | | | | | Restrict upgrades to explicit allowed versionVincent Petry2015-08-303-20/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version.php now contains the previous ownCloud version from which upgrades are allowed. Any other upgrades will show a message that the upgrade/downgrade is not supported.
* | | | | | | Merge pull request #18908 from owncloud/allow-0-as-passwordBjörn Schießle2015-09-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow 0 and false as password
| * | | | | | | Allow 0 and false as passwordLukas Reschke2015-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we use the check for "empty" here passwords such as 0 will not work. Fixes https://github.com/owncloud/password_policy/issues/8
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-0930-0/+50
| | | | | | | |