summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-074-0/+18
|
* [tx-robot] updated from transifexNextcloud bot2017-04-0672-80/+108
|
* Merge pull request #4123 from nextcloud/allow-password-reset-with-emailRoeland Jago Douma2017-04-051-13/+26
|\ | | | | Allow to reset the password with the email as an input
| * Allow to reset the password with the email as an inputJoas Schilling2017-03-281-13/+26
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3741 from nextcloud/user-settings-designRoeland Jago Douma2017-04-051-1/+16
|\ \ | | | | | | User mgmt settings design improvements
| * | proper padding for checkboxes in app-settingsJan-Christoph Borchardt2017-04-041-1/+16
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-052-12/+52
|/ /
* | Merge pull request #4071 from nextcloud/issue-173-database-conversion-failureJoas Schilling2017-04-041-1/+30
|\ \ | | | | | | Make sure blob columns are correctly converted as parameters
| * | Use false because null crashes the cacheJoas Schilling2017-03-261-3/+9
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Make sure blob columns are correctly converted as parametersJoas Schilling2017-03-261-1/+24
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #2095 from nextcloud/bruteforcesetttingsLukas Reschke2017-04-041-0/+1
|\ \ \ | | | | | | | | Introduce bruteforce settings
| * | | Fix testsRoeland Jago Douma2017-04-041-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | App is always enabledRoeland Jago Douma2017-04-021-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #4093 from nextcloud/endorse-password-protectionRoeland Jago Douma2017-04-042-4/+23
|\ \ \ \ | | | | | | | | | | Endorse password protection
| * | | | let the user set an empty password for share linkTimo Benk2017-04-031-3/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | endorseLinkPassword changed to enableLinkPasswordByDefaultTimo Benk2017-04-032-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | feature endorse password for share linksTimo Benk2017-04-032-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | works like "enforce password protection", but let the user optionally remove the password protection after the password is set. Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-044-0/+78
| | | | |
* | | | | Move to autosize.min.jsRoeland Jago Douma2017-04-035-555/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Bump autosize.jsRoeland Jago Douma2017-04-032-35/+62
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #4175 from nextcloud/fix-socialmenudisplayRoeland Jago Douma2017-04-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Do not show social menu when there is no link share
| * | | | Do not show social menu when there is no link shareRoeland Jago Douma2017-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-034-0/+6
| |/ / / |/| | |
* | | | Merge pull request #4183 from nextcloud/css-shortcuts-viewLukas Reschke2017-04-021-1/+30
|\ \ \ \ | | | | | | | | | | Add CSS for styling of keyboard shortcuts view
| * | | | Add CSS for styling of keyboard shortcuts viewJan-Christoph Borchardt2017-03-301-1/+30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-022-0/+2
| | | | |
* | | | | Merge pull request #4174 from nextcloud/mergejs-newlineChristoph Wurst2017-04-011-7/+23
|\ \ \ \ \ | | | | | | | | | | | | mergejs should print a newline between imports
| * | | | | mergejs should print a newline between importsRoeland Jago Douma2017-03-311-7/+23
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / | | | [tx-robot] updated from transifexNextcloud bot2017-04-012-0/+456
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-312-0/+2
| | | |
* | | | Merge pull request #4128 from nextcloud/updateclipboardJoas Schilling2017-03-306-1485/+15
|\ \ \ \ | |/ / / |/| | | Update clipboard.js
| * | | Use minified clipboard.jsRoeland Jago Douma2017-03-295-1517/+11
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Update clipboard.jsRoeland Jago Douma2017-03-292-210/+246
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #4132 from nextcloud/fix-safari-gzipLukas Reschke2017-03-302-2/+2
|\ \ \ \ | | | | | | | | | | Fix gzip files for Safari
| * | | | Fix gzip files for SafariMorris Jobke2017-03-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Safari support gzip only if the filename does not end on .gz - so this renames them to .gzip Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #4100 from nextcloud/header-indicatorMorris Jobke2017-03-292-2/+26
|\ \ \ \ \ | | | | | | | | | | | | show triangle below user menu too when an entry inside there is active
| * | | | | adjust opacity of search and gear icons in headerJan-Christoph Borchardt2017-03-272-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | add pointer finger to full clickable app icon areaJan-Christoph Borchardt2017-03-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | show triangle below user menu too when an entry inside there is activeJan-Christoph Borchardt2017-03-271-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-306-120/+142
| | | | | |
* | | | | | Merge pull request #4142 from nextcloud/numeric_avatarMorris Jobke2017-03-291-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow avatars for full numeric users
| * | | | | | Fix testsRoeland Jago Douma2017-03-291-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Allow avatars for full numeric usersRoeland Jago Douma2017-03-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4087 Because of fancy javascript if a full numeric uid was used javascript would convert this to an int. Now we just convert everything to a string first. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | rename confusing getMailHeaderColor to getColorPrimary, ref #3491Jan-Christoph Borchardt2017-03-294-7/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-pJoas Schilling2017-03-291-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Replace unecessary unescaped prints with print
| * | | | | Replace unecessary unescaped prints with printLukas Reschke2017-03-291-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | There's no need to have those unescaped from what I can see. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #4091 from nextcloud/Rudloff-manifestMorris Jobke2017-03-282-0/+15
|\ \ \ \ \ | | | | | | | | | | | | Web app manifest for adding to Android home screen
| * | | | | Web app manifestPierre Rudloff2017-03-282-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-2918-0/+18
| | | | | |
* | | | | | Merge pull request #4126 from nextcloud/better-empty-content-in-the-sidebarMorris Jobke2017-03-281-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Better styling of the empty content messages in the sidebar