summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Revert unintentional log timestamp format changeJoas Schilling2017-01-302-3/+3
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* 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>
| * | | | | | | Allow apps to specify an icon with the sections via the APIJoas Schilling2017-01-192-0/+39
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #3214 from nextcloud/cache-storage-infoRobin Appelman2017-01-241-5/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | cache the storage info for 5 min
| * | | | | | | hash the path used for the cache key to prevent key length problemsRobin Appelman2017-01-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | cache the storage info for 5 minRobin Appelman2017-01-231-5/+28
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-01-242-0/+26
| | | | | | |
* | | | | | | Merge pull request #3212 from mwalbeck/mimetype-hidden-filesRobin Appelman2017-01-231-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Mimetype detection for hidden files
| * | | | | | | Reduced code for filename trimMagnus Walbeck2017-01-231-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Magnus Walbeck <mw@mwalbeck.org>
| * | | | | | | Mimetype detection for hidden filesMagnus Walbeck2017-01-231-0/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Magnus Walbeck <mw@mwalbeck.org>
* | | | | | | Merge pull request #3157 from nextcloud/fcloseafterkillMorris Jobke2017-01-232-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [uc] Prevent PHP request to get killed when using fclose callback (#26775)
| * | | | | | Prevent PHP request to get killed when using fclose callback (#26775)Vincent Petry2017-01-232-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Prevent PHP request to get killed when using fclose callback * Add ignore_user_abort everywhere where the time limit is set to 0 Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #3141 from ↵Joas Schilling2017-01-231-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | nextcloud/subadmin-check-on-removing-user-from-group Subadmin check on removing user from group
| * | | | | | Fix CamelCasingJoas Schilling2017-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #3004 from nextcloud/fix-installation-cssLukas Reschke2017-01-223-26/+34
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fixed installation page
| * | | | | | Create unified css file and merge all needed data into this fileJohn Molakvoæ (skjnldsv)2017-01-102-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Removed jquery scssJohn Molakvoæ (skjnldsv)2017-01-102-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Switched to setup.css - Disable scss when displaying the update page - Improved setup css - Fixed loading failure of other styles on setup & update page - Improved scss compiler with an ignore scss compilation option Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | Fix default of mail_smtpmode - fixes #3102Morris Jobke2017-01-191-1/+1
| |_|/ / / / |/| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | add action to existing brute force protectionBjoern Schiessle2017-01-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | handle optional annotation parametersBjoern Schiessle2017-01-182-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>