summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #15235 from owncloud/remote-share-hintMorris Jobke2015-04-093-6/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Correctly generate the doc link via go.phpJoas Schilling2015-04-092-4/+5
| * | | | | | | | | | Fix config usageJoas Schilling2015-04-091-6/+5
| * | | | | | | | | | fix remote share info icon for IE8Jan-Christoph Borchardt2015-04-091-1/+1
| * | | | | | | | | | add more present info about remote shares, fix layout of inputsJan-Christoph Borchardt2015-04-092-2/+17
| * | | | | | | | | | correct remote share hintJan-Christoph Borchardt2015-03-261-1/+1
| * | | | | | | | | | add remote share status to the configBjoern Schiessle2015-03-261-0/+4
| * | | | | | | | | | add hint in Share placeholder on remote share syntaxJan-Christoph Borchardt2015-03-261-1/+6
* | | | | | | | | | | Merge pull request #13896 from owncloud/share-generatetarget-remove-excludeBjörn Schießle2015-04-091-17/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Dont create exclude list for generating the share targetRobin Appelman2015-02-041-17/+2
* | | | | | | | | | | Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deletingThomas Müller2015-04-093-12/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Check if the key exists, before trying to delete itJoas Schilling2015-04-093-12/+29
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #15500 from owncloud/installation-hintMorris Jobke2015-04-095-8/+41
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add link to installation documentation to setup pageJan-Christoph Borchardt2015-04-095-2/+19
| * | | | | | | | | | | fix position of SQLite warningJan-Christoph Borchardt2015-04-091-0/+4
| * | | | | | | | | | | code style fixesJan-Christoph Borchardt2015-04-091-6/+18
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #15507 from owncloud/remove-uneeded-fileBjörn Schießle2015-04-091-33/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove unneeded fileLukas Reschke2015-04-091-33/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #15503 from owncloud/link-standard-subscriptionThomas Müller2015-04-091-7/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | help section: code style and wording fixesJan-Christoph Borchardt2015-04-091-6/+6
| * | | | | | | | | link to proper subsite for Commercial supportJan-Christoph Borchardt2015-04-091-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #15499 from owncloud/admin-hintsJan-Christoph Borchardt2015-04-095-0/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add admin documentation hints to Federated Cloud Sharing and cronJan-Christoph Borchardt2015-04-095-0/+18
| |/ / / / / / / /
* | | | | | | | | Merge pull request #15497 from owncloud/enforce-type-securityLukas Reschke2015-04-096-24/+41
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix PHPDocLukas Reschke2015-04-095-22/+20
| * | | | | | | | Fix code styleLukas Reschke2015-04-091-1/+8
| * | | | | | | | Enforce string as passed typeLukas Reschke2015-04-091-1/+13
|/ / / / / / / /
* | | | | | | | Merge pull request #15314 from owncloud/app-categories-15274Lukas Reschke2015-04-0920-267/+1719
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add JS unit test for sortingLukas Reschke2015-04-081-0/+54
| * | | | | | | Reference `$(this)` insteadLukas Reschke2015-04-081-1/+1
| * | | | | | | Fix wordingLukas Reschke2015-04-082-2/+2
| * | | | | | | Fix PHPDocLukas Reschke2015-04-071-1/+3
| * | | | | | | Deduplicate codeLukas Reschke2015-04-071-44/+31
| * | | | | | | apps mgmt: style experimental apps section, small design fixesJan-Christoph Borchardt2015-04-072-9/+21
| * | | | | | | app mgmt app level design enhancementsJan-Christoph Borchardt2015-04-074-36/+39
| * | | | | | | Make user names clickableLukas Reschke2015-04-033-0/+7
| * | | | | | | Add experimental applications switchLukas Reschke2015-04-0318-246/+1633
* | | | | | | | Merge pull request #14676 from owncloud/deleteorphanedsharesMorris Jobke2015-04-093-0/+222
|\ \ \ \ \ \ \ \
| * | | | | | | | Disable trashbin when testing orphaned shares deletion jobVincent Petry2015-04-081-0/+17
| * | | | | | | | Added FIXME about registering jobs in apps.phpVincent Petry2015-04-081-0/+2
| * | | | | | | | Delete orphaned shares in a background jobVincent Petry2015-04-083-0/+203
* | | | | | | | | Merge pull request #15196 from owncloud/limit-file-activities-to-favoritesMorris Jobke2015-04-0911-12/+658
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make scrutinizer happyJoas Schilling2015-04-017-23/+16
| * | | | | | | | | Adjust by/self filter aswell and fix testsJoas Schilling2015-03-312-3/+3
| * | | | | | | | | DeMorgan applied the wrong transformationJoas Schilling2015-03-311-2/+1
| * | | | | | | | | Move tag related code into a helper so we can test the query without a viewJoas Schilling2015-03-304-36/+416
| * | | | | | | | | Use DI for the objects where possibleJoas Schilling2015-03-302-7/+27
| * | | | | | | | | Add tests from getCurrentUserId() method and fix the constructorJoas Schilling2015-03-301-1/+109
| * | | | | | | | | Add a filter for favorites and allow limiting the all-list to favoritesJoas Schilling2015-03-301-2/+69
| * | | | | | | | | Add logic for getting the user from the rss token to the ManagerJoas Schilling2015-03-303-2/+81