summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-02-0310-14/+30
|
* Merge pull request #3359 from nextcloud/fix-sharing-app-descriptionMorris Jobke2017-02-021-2/+2
|\ | | | | Fix Sharing app description
| * Fix Sharing app descriptionJoas Schilling2017-02-021-2/+2
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2017-02-0242-60/+274
|
* [tx-robot] updated from transifexNextcloud bot2017-02-0136-88/+1104
|
* Merge pull request #3321 from ↵Morris Jobke2017-01-313-6/+5
|\ | | | | | | | | nextcloud/revert-unintentional-change-of-log-timestamp-format Revert unintentional log timestamp format change
| * Fix config.sample.phpMorris Jobke2017-01-301-3/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * 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-3022-80/+637
|\ \ | | | | | | Login credential store
| * | minor version bumpChristoph Wurst2017-01-172-2/+2
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | always allow remembered loginChristoph Wurst2017-01-119-32/+0
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | fix constructor params in failing testChristoph Wurst2017-01-111-6/+9
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | do not hard-require the token providerChristoph Wurst2017-01-113-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | 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-113-19/+77
| | | | | | | | | | | | | | | | | | | | | 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>
| * | migrate 'password::sessioncredentials' extern storage auth to credential storeChristoph Wurst2017-01-111-32/+24
| | | | | | | | | | | | 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-1111-0/+496
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #3169 from nextcloud/update-doctrineMorris Jobke2017-01-301-0/+0
|\ \ \ | | | | | | | | Update doctrine
| * | | Update doctrineJoas Schilling2017-01-301-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-01-3116-82/+244
| | | |
* | | | Merge pull request #3282 from nextcloud/header-menu-arrow-upMorris Jobke2017-01-301-23/+15
|\ \ \ \ | |/ / / |/| | | Merge similar properties and standardize the arrow to the menu class
| * | | Merge similar properties and apply arrow to menu classJohn Molakvoæ (skjnldsv)2017-01-261-23/+15
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #2970 from nextcloud/notify-self-testMorris Jobke2017-01-3019-49/+749
|\ \ \ \ | | | | | | | | | | Add self-test for files_external:notify
| * | | | update autoloaderRobin Appelman2017-01-274-0/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Add sinceRobin Appelman2017-01-273-0/+28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | add unit tests for smb notify backendRobin Appelman2017-01-272-0/+48
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | add notify self testRobin Appelman2017-01-271-1/+36
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | switch occ files_external:notify to new notify mechanismRobin Appelman2017-01-271-10/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Add a more powerful notify mechanismRobin Appelman2017-01-278-39/+423
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Add missing smb filesRobin Appelman2017-01-275-0/+185
| | | | | | | | | | | | | | | | | | | | 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-306-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Add proper default value for datadir
| * | | | | Add proper default value for datadirMorris Jobke2017-01-196-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * better safe than sorry * fixes #3091 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3260 from nextcloud/various-scss-fixesChristoph Wurst2017-01-301-20/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Various scss fixes
| * | | | | | Blue shadow fix 2John Molakvoæ (skjnldsv)2017-01-261-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Blue left shadow fix #3288John Molakvoæ (skjnldsv)2017-01-261-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | No more height css calc for app-navigation childrenJohn Molakvoæ (skjnldsv)2017-01-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Fix popover conflicts with app-navigation li (color & opacity)John Molakvoæ (skjnldsv)2017-01-251-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Border radius fix on popoverJohn Molakvoæ (skjnldsv)2017-01-251-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-01-3014-62/+202
| | | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-01-2910-16/+452
| | | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-01-2884-286/+550
| | | | | | |
* | | | | | | Merge pull request #2822 from nextcloud/add-navigation-via-info.xmlMorris Jobke2017-01-276-20/+188
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Add navigation via info.xml (#26785)
| * | | | | | Force to specify the nameJoas Schilling2017-01-273-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | remove unused parameters and add viewBoxMorris Jobke2017-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Add navigation via info.xml (#26785)Thomas Müller2016-12-226-20/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-273-4/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | fix default value for logdateformat