| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #5835 from nextcloud/cleanup_testing_app | Morris Jobke | 2017-07-24 | 7 | -315/+330 |
| |\ | | | | | Cleanup testing app | ||||
| | * | Move over locking controller | Roeland Jago Douma | 2017-07-24 | 4 | -274/+303 |
| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | Move over Config | Roeland Jago Douma | 2017-07-24 | 2 | -50/+36 |
| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | Move Application to AppInfo | Roeland Jago Douma | 2017-07-24 | 2 | -2/+2 |
| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Merge pull request #5514 from nextcloud/assembly-stream-seek | Morris Jobke | 2017-07-24 | 1 | -56/+32 |
| |\ \ | | | | | | | refactor chunked assembly stream | ||||
| | * | | refactor chunked assembly stream | Robin Appelman | 2017-07-21 | 1 | -56/+32 |
| | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | Some app fixes of phpstorm inspections | Roeland Jago Douma | 2017-07-24 | 20 | -46/+48 |
| | |/ |/| | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-24 | 52 | -108/+266 |
| | | | |||||
| * | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-23 | 28 | -124/+344 |
| | | | |||||
| * | | Merge pull request #5827 from nextcloud/improve-public-share-header | Morris Jobke | 2017-07-22 | 2 | -4/+16 |
| |\ \ | | | | | | | Add filename and sharer in public page | ||||
| | * | | Add filename and sharer in public page | Morris Jobke | 2017-07-21 | 2 | -4/+16 |
| | |/ | | | | | | | | | | | | | | | * shows the filename and sharer on the public page * allows the user to identify, that this is a user page and not an official page of the Nextcloud hosting * remove link on logo that redirects to login (fixes #5720) Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-22 | 50 | -4/+130 |
| | | | |||||
| * | | Merge pull request #5823 from nextcloud/improve-error-handling | Morris Jobke | 2017-07-21 | 3 | -13/+22 |
| |\ \ | |/ |/| | Improve error handling for accepting federated shares | ||||
| | * | use OCSv2 to make sure that the error also arrives at the web front-end | Bjoern Schiessle | 2017-07-21 | 1 | -2/+2 |
| | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | improved error handling | Bjoern Schiessle | 2017-07-21 | 2 | -11/+20 |
| | | | | | | | | | | | | | | | check if table was updated successfully and only then send a notification mail and return "true". Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | Merge pull request #5753 from nextcloud/fed-unshare-fail-remote | Roeland Jago Douma | 2017-07-21 | 1 | -2/+7 |
| |\ \ | | | | | | | still remove the federated share even if we cant notify the remote | ||||
| | * | | still remove the federated share even if we cant notify the remote | Robin Appelman | 2017-07-17 | 1 | -2/+7 |
| | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | Merge pull request #5803 from nextcloud/fix-public-links | Morris Jobke | 2017-07-21 | 1 | -1/+3 |
| |\ \ \ | | | | | | | | | fix preview for public links | ||||
| | * | | | fix preview for public links | Bjoern Schiessle | 2017-07-20 | 1 | -1/+3 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | in case a user is already logged in on the same server from which the public link comes from, we need to setup the owners file system in order to show the preview Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | Merge pull request #5817 from nextcloud/add-basic-sql-injection-checker | Morris Jobke | 2017-07-21 | 3 | -0/+15 |
| |\ \ \ | | | | | | | | | Add Phan plugin to check for SQL injections | ||||
| | * | | | Add Phan plugin to check for SQL injections | Lukas Reschke | 2017-07-20 | 3 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a phan plugin which checks for SQL injections on code using our QueryBuilder, while it isn't perfect it should already catch most potential issues. As always, static analysis will sometimes have false positives and this is also here the case. So in some cases the analyzer just doesn't know if something is potential user input or not, thus I had to add some `@suppress SqlInjectionChecker` in front of those potential injections. The Phan plugin hasn't the most awesome code but it works and I also added a file with test cases. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-21 | 276 | -940/+316 |
| | | | | | |||||
| * | | | | Merge pull request #5629 from nextcloud/add-recovery-key-on-public-upload | Björn Schießle | 2017-07-20 | 1 | -2/+21 |
| |\ \ \ \ | |/ / / |/| | | | Add recovery key on public upload | ||||
| | * | | | make sure that we always have a owner | Bjoern Schiessle | 2017-07-20 | 1 | -4/+17 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | Add recovery key on public upload | Bjoern Schiessle | 2017-07-20 | 1 | -2/+8 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | In order to decide if a recovery key needs to be added we always need to check the files owner settings and not the settings of the currently logged in user. Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * / / | Fix copy and paste error on activity descriptions | Joas Schilling | 2017-07-20 | 2 | -2/+2 |
| |/ / | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-20 | 30 | -0/+120 |
| | | | |||||
| * | | Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokens | Joas Schilling | 2017-07-19 | 2 | -3/+2 |
| |\ \ | | | | | | | Only use readable chars in Share Tokens | ||||
| | * | | Only use readable chars in Share Tokens | Joas Schilling | 2017-07-18 | 2 | -3/+2 |
| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Merge pull request #5776 from nextcloud/install-phan | Roeland Jago Douma | 2017-07-19 | 4 | -5/+9 |
| |\ \ \ | | | | | | | | | Run phan over code base | ||||
| | * | | | Run phan over code base | Lukas Reschke | 2017-07-19 | 4 | -5/+9 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | Add Android and iOS URLs to theming app | Morris Jobke | 2017-07-19 | 2 | -0/+71 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | Allow overwriting of IOS theming values | Roeland Jago Douma | 2017-07-19 | 1 | -1/+20 |
| |/ / / | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-19 | 182 | -654/+670 |
| | | | | |||||
| * | | | Merge pull request #5739 from nextcloud/comradekingu-patch-4 | Roeland Jago Douma | 2017-07-18 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | Spelling: Bigversal and LDAP | ||||
| | * | | | : Bigversal and LDAP | Allan Nordhøy | 2017-07-14 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #5736 from smueller18/patch-2 | Morris Jobke | 2017-07-18 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | do not show hyphen in og:title if slogan does not exist | ||||
| | * | | | | do not show hyphen in og:title if slogan does not exist | Stephan Müller | 2017-07-14 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | Merge pull request #5735 from nextcloud/comradekingu-patch-1 | Roeland Jago Douma | 2017-07-18 | 1 | -4/+4 |
| |\ \ \ \ | | | | | | | | | | | Spelling: Shortening and binding | ||||
| | * | | | | Spelling: Shortening and binding | Allan Nordhøy | 2017-07-14 | 1 | -4/+4 |
| | |/ / / | |||||
| * | | | | Merge pull request #5737 from nextcloud/comradekingu-patch-2 | Morris Jobke | 2017-07-18 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | Spelling: command-line, Consider narrowing | ||||
| | * | | | | command-line, Consider narrowing | Allan Nordhøy | 2017-07-14 | 1 | -3/+3 |
| | |/ / / | |||||
| * | | | | Merge pull request #5741 from nextcloud/comradekingu-patch-6 | Morris Jobke | 2017-07-18 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | Spelling: sent, an invitation, - successful | ||||
| | * | | | | sent, an invitation, - successful | Allan Nordhøy | 2017-07-14 | 1 | -2/+2 |
| | |/ / / | |||||
| * | | | | Merge pull request #5740 from nextcloud/comradekingu-patch-5 | Morris Jobke | 2017-07-18 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | Spelling: log out, : Bigversal | ||||
| | * | | | | log out, : Bigversal | Allan Nordhøy | 2017-07-14 | 1 | -2/+2 |
| | |/ / / | |||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-18 | 50 | -116/+116 |
| | | | | | |||||
| * | | | | Merge pull request #5743 from nextcloud/comradekingu-patch-7 | Roeland Jago Douma | 2017-07-17 | 1 | -1/+1 |
| |\ \ \ \ | |_|_|/ |/| | | | Spelling: - your | ||||
| | * | | | - your | Allan Nordhøy | 2017-07-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | This avoids it being «"access to your "the cloud"» or similar. Italicizing %s might be a middleground here. | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-17 | 12 | -132/+506 |
| |/ / / | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |