summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-03-202-0/+436
|
* Use SystemConfig instead of AllConfig for DB stuffMorris Jobke2017-03-1912-58/+65
| | | | | | * preparation for followup PRs to clean up the DB bootstrapping Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #3927 from nextcloud/minor-fixesMorris Jobke2017-03-195-34/+35
|\ | | | | Namespace and array syntax fixes
| * Namespace and array syntax fixesMorris Jobke2017-03-195-34/+35
| | | | | | | | | | | | * minor fixes in preparation of a bigger DB and config PR Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #3906 from nextcloud/shares-circles-2Roeland Jago Douma2017-03-193-5/+57
|\ \ | | | | | | Support Circles
| * | shares-circlesMaxence Lange2017-03-173-5/+57
| |/ | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | [tx-robot] updated from transifexNextcloud bot2017-03-182-62/+62
| |
* | Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-urlLukas Reschke2017-03-183-7/+23
|\ \ | |/ |/| Always suggest the overwrite.cli.url
| * Always suggest the overwrite.cli.urlJoas Schilling2017-03-173-7/+23
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3892 from nextcloud/downstream-27101Joas Schilling2017-03-171-1/+5
|\ \ | |/ |/| Redirect unlink to rmdir
| * Redirect unlink to rmdir (#27101)Vincent Petry2017-03-161-1/+5
| | | | | | | | | | | | | | Many API callers will call unlink even for directories and it can mess up with some wrappers like the encryption wrapper Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #3883 from nextcloud/downstream-26968blizzz2017-03-171-2/+16
|\ \ | | | | | | Ignore exception when deleting keys of deleted user
| * | Ignore exception when deleting keys of deleted userVincent Petry2017-03-171-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | Whenever a user was deleted for encryption where the keys are stored in the home, we can ignore user existence exceptions because it means the keys are already gone. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3878 from nextcloud/downstream-26303Joas Schilling2017-03-171-1/+2
|\ \ \ | | | | | | | | Fixed failing test which was ignoring a required (not null) column
| * | | Fixed failing test which was ignoring a required (not null) column (#26303)Philipp Schaffrath2017-03-171-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed failing test which was ignoring a required (not null) column * restored test to original, catching DriverException which also catches ConstraintViolationException * catch ConstraintViolationException again * removed unnecessary field from this test * clobfield should be nullable * clobfield now is nullable * removed autoincrement since whenever this strategy is enabled, oracle would not throw constraint violation exceptions (needed for setValues), which mysql still does * this field does not auto increment anymore * mark integerfield as primary, since it is not getting marked as such through auto increment anymore, integerfield default always has been 0 instead of null Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3885 from nextcloud/downstream-26529Joas Schilling2017-03-171-0/+12
|\ \ \ | | | | | | | | Skip FailedStorage in background scan
| * | | Skip FailedStorage in background scanVincent Petry2017-03-171-0/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | The background job that scans storages must skip failed storages to avoid potential exceptions, especially when the failed storage comes from a shared storage where the source is not accessible. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #3856 from nextcloud/escape-likes-in-database-user-backendRoeland Jago Douma2017-03-171-3/+3
|\ \ \ | | | | | | | | Escape like parameters in database user backend
| * | | Don't call function in constructorLukas Reschke2017-03-161-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | The constructor is iniitiated already very early in base.php, thus requiring this here will break the setup and some more. For now we probably have to live with a static function call here thus. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | Escape like parameters in database user backendLukas Reschke2017-03-151-3/+7
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #3870 from nextcloud/add-base-uri-to-csp-policyRoeland Jago Douma2017-03-171-0/+1
|\ \ \ \ | | | | | | | | | | Add base-uri to CSP policy
| * | | | Add base-uri to CSP policyLukas Reschke2017-03-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per https://twitter.com/we1x/status/842032709543333890 a nice security hardening Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #3619 from nextcloud/fix-scss-for-appsMorris Jobke2017-03-164-7/+94
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix SCSS usage in apps
| * | | | Properly calculate webdir using the serverrootRoeland Jago Douma2017-03-102-5/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | SCSS files don't exist on the default fs so just add them to theRoeland Jago Douma2017-03-101-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resource list Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Fix SCSS usage in appsMorris Jobke2017-03-101-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix the web root detection of the ResourceLocator for apps Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-172-0/+464
| |_|_|/ |/| | |
* | | | Merge pull request #3679 from nextcloud/socialsharingLukas Reschke2017-03-161-0/+1
|\ \ \ \ | | | | | | | | | | Add social sharing
| * | | | Move social buttons to menuRoeland Jago Douma2017-03-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If there are social sharing buttons move them and the copy action to a menu * If there are no social sharing buttons just leave the copy action where it is directly Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Add social sharingRoeland Jago Douma2017-03-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add socialshare manager * Add social share field under link share Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #3008 from nextcloud/appmenu-experimentMorris Jobke2017-03-162-8/+77
|\ \ \ \ \ | |_|_|/ / |/| | | | Show apps in header
| * | | | Make app management icon act like a normal app iconJulius Haertl2017-03-161-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Fix menu issuesJulius Haertl2017-03-161-6/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Generate seperate menu list for header barJulius Haertl2017-03-162-3/+43
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | Move active app to the first slotJulius Haertl2017-03-161-9/+19
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | | Merge pull request #3802 from Ko-/masterRoeland Jago Douma2017-03-162-2/+6
|\ \ \ \ | |/ / / |/| | | Check that set_time_limit is not disabled before calling it
| * | | Check that set_time_limit is not disabled before calling itKo-2017-03-112-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
* | | | Merge pull request #3843 from nextcloud/encryption-fix-mail-shareJoas Schilling2017-03-151-3/+3
|\ \ \ \ | | | | | | | | | | take share by mail into consideration if we calculate the access list
| * | | | take share by mail into consideration if we calculate the access listBjoern Schiessle2017-03-141-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-152-2/+20
| | | | |
* | | | | Merge pull request #3838 from Xuanwo/basename-fixRoeland Jago Douma2017-03-141-1/+2
|\ \ \ \ \ | | | | | | | | | | | | [OC/Files/Cache]: Fix wrong usage of basename
| * | | | | [OC/Files/Cache]: Fix wrong usage of basenameXuanwo2017-03-141-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://github.com/nextcloud/server/issues/3837 Signed-off-by: Xuanwo <xuanwo@yunify.com>
* | | | | Merge pull request #3836 from nextcloud/do-not-double-check-app-updateRoeland Jago Douma2017-03-142-9/+4
|\ \ \ \ \ | | | | | | | | | | | | Do not check for app update twice
| * | | | | Do not double cherck app updateMorris Jobke2017-03-132-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In base.php the apps are already checked for an update. No need to repeat this during loading of the app. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3600 from coletivoEITA/masterRoeland Jago Douma2017-03-143-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | added method needsPartFile() in Storage
| * | | | | | added method needsPartFile() in StorageVinicius Cubas Brand2017-03-143-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
* | | | | | | Merge pull request #3783 from andrius-kulbis/masterRoeland Jago Douma2017-03-141-1/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Fix deleted objectstore shares
| * | | | | | Fix detecting deleted shares in object storeAndrius2017-03-091-1/+2
| | | | | | | | | | | | | | | | | | | | | While using the object store, the shares, that are moved to trashbin were still detected as accessible and cause broken shares to be shown in file/folder listing.
* | | | | | | dont allow empty wildcard searchRobin Appelman2017-03-131-0/+4
| |_|/ / / / |/| | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #3780 from GitHubUser4234/audit_log_agentLukas Reschke2017-03-131-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Audit log the User-Agent
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 06:24:54 +0000