summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #18851 from owncloud/memcached-getallkeys-fallbackRobin McCorkell2015-09-102-0/+28
|\
| * Fallback to complete Memcached flush if getAllKeys failsRobin McCorkell2015-09-052-0/+28
* | Merge pull request #18699 from owncloud/notification-managerLukas Reschke2015-09-1024-3/+2662
|\ \
| * | 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 compatibilityLukas Reschke2015-07-211-0/+11
* | | | 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 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 sentLukas Reschke2015-09-093-0/+3
* | | | | [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 PHPDocLukas Reschke2015-09-083-24/+100
* | | | | Merge pull request #18873 from owncloud/enc_use_master_passwordLukas Reschke2015-09-0910-27/+472
|\ \ \ \ \
| * | | | | 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 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 warningLukas Reschke2015-09-091-2/+2
* | | | | | | Merge pull request #18913 from owncloud/put-in-single-field-for-speedLukas Reschke2015-09-094-35/+52
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
| * | | | | | 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
|\ \ \ \ \ \
| * | | | | | 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
* | | | | | | Merge pull request #18908 from owncloud/allow-0-as-passwordBjörn Schießle2015-09-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Allow 0 and false as passwordLukas Reschke2015-09-081-1/+1
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-0930-0/+50