summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* oc_token should be nc_tokenChristoph Wurst2017-02-021-1/+1
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* [tx-robot] updated from transifexNextcloud bot2017-02-022-10/+10
|
* Merge pull request #3321 from ↵Morris Jobke2017-01-312-3/+3
|\ | | | | | | | | nextcloud/revert-unintentional-change-of-log-timestamp-format Revert unintentional log timestamp format change
| * Revert unintentional log timestamp format changeJoas Schilling2017-01-302-3/+3
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2044 from nextcloud/login-credential-storeMorris Jobke2017-01-3010-22/+357
|\ \ | | | | | | Login credential store
| * | always allow remembered loginChristoph Wurst2017-01-111-21/+0
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | do not hard-require the token providerChristoph Wurst2017-01-112-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | The provider might need DB access and therefore depenedency resolution fails on the setup page where we cannot inject the db implementation. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | use login hook credentials as fallbackChristoph Wurst2017-01-111-0/+21
| | | | | | | | | | | | | | | | | | | | | If no session token is available, we can use the credentials provided by the login hook. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | fix @since annotations (9.1->12)Christoph Wurst2017-01-114-8/+8
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | replace session implementation if it changes at runtimeChristoph Wurst2017-01-112-1/+11
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | add @since annotations and document methodsChristoph Wurst2017-01-112-0/+14
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | add login credential storeChristoph Wurst2017-01-119-0/+303
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | [tx-robot] updated from transifexNextcloud bot2017-01-312-42/+84
| | |
* | | Merge pull request #2970 from nextcloud/notify-self-testMorris Jobke2017-01-308-0/+300
|\ \ \ | | | | | | | | Add self-test for files_external:notify
| * | | update autoloaderRobin Appelman2017-01-272-0/+10
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Add sinceRobin Appelman2017-01-273-0/+28
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Add a more powerful notify mechanismRobin Appelman2017-01-276-0/+262
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #3298 from nextcloud/downstream-26928blizzz2017-01-301-12/+1
|\ \ \ \ | |_|_|/ |/| | | remove obsolete hack (#26928)
| * | | remove obsolete hack (#26928)Jörn Friedrich Dreyer2017-01-271-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove obsolete hack > // file_get_contents() has a memory leak: https://bugs.php.net/bug.php?id=61961 was closed 4 years ago. we could also use the Common implementation Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #3176 from nextcloud/default-value-datadirblizzz2017-01-303-3/+3
|\ \ \ \ | | | | | | | | | | Add proper default value for datadir
| * | | | Add proper default value for datadirMorris Jobke2017-01-193-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * better safe than sorry * fixes #3091 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-01-292-0/+422
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-01-282-2/+2
| | | | |
* | | | | Merge pull request #2822 from nextcloud/add-navigation-via-info.xmlMorris Jobke2017-01-272-8/+107
|\ \ \ \ \ | |_|/ / / |/| | | | Add navigation via info.xml (#26785)
| * | | | Force to specify the nameJoas Schilling2017-01-271-4/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add navigation via info.xml (#26785)Thomas Müller2016-12-222-8/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Read navigation information from info.xml * Load files navigation elements from info.xml * Add comment about ignoring the exception Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #3178 from nextcloud/default-value-logdateformatJoas Schilling2017-01-272-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | fix default value for logdateformat
| * | | | fix default value for logdateformat - fixes #3107Morris Jobke2017-01-192-3/+3
| | |/ / | |/| | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #3046 from nextcloud/issue-2190-imagepath-is-root-sensitiveLukas Reschke2017-01-271-1/+1
|\ \ \ \ | | | | | | | | | | Make sure different webroots use different cached paths
| * | | | Make sure different webroots use different cached pathsJoas Schilling2017-01-121-1/+1
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #3284 from nextcloud/remove-avatar-fixupMorris Jobke2017-01-264-120/+0
|\ \ \ \ | | | | | | | | | | remote now unneeded AvatarPermissions repair step
| * | | | remote now unneeded AvatarPermissions repair stepRobin Appelman2017-01-264-120/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avatars are now stored in appdata Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #3246 from nextcloud/fix-sqlite-dependencyMorris Jobke2017-01-261-5/+3
|\ \ \ \ \ | | | | | | | | | | | | Remove useless dependency on SQLite (non-PDO)
| * | | | | Remove useless dependency on SQLite (non-PDO)Morris Jobke2017-01-251-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * we only require the PDO driver * fixes #481 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3238 from nextcloud/dav-testLukas Reschke2017-01-262-5/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Make DAV external storage test more reliable
| * | | | | Make DAV external storage test more reliableRobin Appelman2017-01-242-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #3197 from nextcloud/enable-scss-for-all-appsMorris Jobke2017-01-252-10/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Enable every app to generate their scss file
| * | | | | | Appdata var fixJohn Molakvoæ (skjnldsv)2017-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Remove unused webrootJohn Molakvoæ (skjnldsv)2017-01-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Enable every app to generate their scss fileJohn Molakvoæ (skjnldsv)2017-01-222-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | Merge pull request #3223 from nextcloud/fix-public-page-styleBjörn Schießle2017-01-251-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix public page style
| * | | | | | | Fix public page styleMorris Jobke2017-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * checks if the user is on the login page or not instead of check if the user is logged in * fixes #3207 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | Merge pull request #3240 from nextcloud/storage-interface-tweaksChristoph Wurst2017-01-252-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | minor storage interface tweaks
| * | | | | | | | minor storage interface tweaksRobin Appelman2017-01-242-2/+3
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | Merge pull request #3030 from nextcloud/filesapi-renamefailcaseMorris Jobke2017-01-243-109/+82
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Fix files node API failed rename/copy
| * | | | | | | Fix files node API failed rename/copyVincent Petry2017-01-123-108/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a rename or copy operation failed on the view, we must throw an exception instead of just ignoring. Signed-off-by: Vincent Petry <pvince81@owncloud.com>
| * | | | | | | Refactor files node API for more code reuseVincent Petry2017-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Petry <pvince81@owncloud.com>
* | | | | | | | Merge pull request #3151 from nextcloud/navigation-iconsMorris Jobke2017-01-247-11/+73
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | add icons to navigation of personal & admin settings
| * | | | | | | update autoloader static class filesMorris Jobke2017-01-192-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | Add the icon for the default sectionsJoas Schilling2017-01-193-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>