summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Re-optimize filetype and category iconsMarin Treselj2017-11-1633-34/+33
| | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* Merge pull request #7188 from nextcloud/fix-broken-svg-2Morris Jobke2017-11-1627-39/+24
|\ | | | | Re-optimize places and files icons
| * Re-optimize places and files iconsMarin Treselj2017-11-1527-39/+24
| | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | Merge pull request #7189 from nextcloud/security-games-iconsMorris Jobke2017-11-162-0/+9
|\ \ | | | | | | Added security and games icons
| * | Clean up and re-optimize games iconMarin Treselj2017-11-161-1/+1
| | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | Added security and games iconsJohn Molakvoæ (skjnldsv)2017-11-152-0/+9
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-11-1628-4/+154
| | |
* | | Merge pull request #7173 from ↵Morris Jobke2017-11-152-4/+27
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/show_username_in_invitationsemails Show organizer's name in From field of invitation email
| * | | show name of organizer in from name of invitation emailGeorg Ehrke2017-11-142-4/+27
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #7177 from nextcloud/fix-black-transparent-dialogsJan-Christoph Borchardt2017-11-151-1/+1
|\ \ \ \ | |_|_|/ |/| | | Fix linear gradient from black to white in dialogs in Safari
| * | | Fix linear gradient from black to white in dialogs in SafariMorris Jobke2017-11-141-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-15120-228/+242
| | | |
* | | | Merge pull request #7169 from nextcloud/fix-user-searchMorris Jobke2017-11-142-1/+3
|\ \ \ \ | | | | | | | | | | Fix search in user managent when no group is selected
| * | | | Fix search in user managent when no group is selectedMorris Jobke2017-11-142-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * also allows to search by displayname Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #7172 from ↵Morris Jobke2017-11-142-2/+22
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/improve-error-handling-on-preview-cleanup check if the user still exists before we try to cleanup the previews
| * | | | check if the user still exists before we try to cleanup the previewsBjoern Schiessle2017-11-142-2/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | Merge pull request #7171 from nextcloud/bump-versionv13.0.0beta1Lukas Reschke2017-11-141-2/+2
|\ \ \ \ \ | | | | | | | | | | | | v13.0.0 Beta 1
| * | | | | v13.0.0 Beta 1Lukas Reschke2017-11-141-2/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #7113 from nextcloud/s3-download-stream-fixBjörn Schießle2017-11-142-3/+9
|\ \ \ \ \ | |/ / / / |/| | | | Fix s3 download and touch
| * | | | Use non empty files for object store touchRobin Appelman2017-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Fix contructing headers for s3 downloadRobin Appelman2017-11-081-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #7165 from nextcloud/smb-2.0.3Morris Jobke2017-11-1416-47/+126
|\ \ \ \ \ | |_|_|_|/ |/| | | | update icewind/smb to 2.0.3
| * | | | update icewind/smb to 2.0.3Robin Appelman2017-11-1416-47/+126
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #7130 from nextcloud/fix-broken-svgJan-Christoph Borchardt2017-11-1497-201/+88
|\ \ \ \ \ | | | | | | | | | | | | Optimize SVG icons
| * | | | | Fix settings-white iconMarin Treselj2017-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | | | Actions icons fixed and re-optimizedMarin Treselj2017-11-1311-32/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | | | third batch of fixed and re-optimized iconsMarin Treselj2017-11-1018-48/+18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | | | second batch of fixed and re-optimized iconsMarin Treselj2017-11-1028-30/+25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | | | Fixes #4076 - first batch of fixed and re-optimized iconsMarin Treselj2017-11-0640-91/+37
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | | | | Merge pull request #7013 from nextcloud/forgot-passwordJan-Christoph Borchardt2017-11-145-35/+124
|\ \ \ \ \ \ | | | | | | | | | | | | | | Directly show "Forgot password?" link, fix #6808
| * | | | | | Fix acceptance testJohn Molakvoæ (skjnldsv)2017-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Fix template order and animationJohn Molakvoæ (skjnldsv)2017-11-052-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Not disabled by defaultJohn Molakvoæ (skjnldsv)2017-11-052-30/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed transition bug of grouptop Fix password submit and error handling Fixed multiple form send Fix submit loading state fix login form sending state Replace loader type Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Fix loading state and error message displayJohn Molakvoæ (skjnldsv)2017-11-053-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Fix variable nameJan-Christoph Borchardt2017-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | | Add some JS to hide and show elements for password resetJan-Christoph Borchardt2017-11-023-14/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | | Directly show Forgot password link, fix #6808Jan-Christoph Borchardt2017-11-022-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | Merge pull request #7166 from nextcloud/enhancement/crash-report-contextMorris Jobke2017-11-145-9/+13
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Pass the exception context to the crash reporter
| * | | | | | add proper type hintingMorris Jobke2017-11-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Pass the exception context to the crash reporterChristoph Wurst2017-11-145-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should allow better reports as often the app id is passed as context. While this is not used right now, I'd like to have this for NC13 as adding it later will break the interface for existing apps Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | Merge pull request #4856 from coderkun/issue-3808-xframe-denyLukas Reschke2017-11-141-9/+13
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Improve warning for X-Frame-Options header DENY (#3808)
| * | | | | | Improve warning for X-Frame-Options header DENY (#3808)coderkun2017-05-141-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Oliver Hanraths <olli@coderkun.de>
* | | | | | | Merge pull request #5749 from nextcloud/ldap-primary-buttonsblizzz2017-11-144-1/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | LDAP Wizard: primary-style buttons
| * | | | | | | add newline at the end of the ~~universe~~ fileArthur Schiwon2017-11-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | Use primary class also for ui-button elementsJulius Härtl2017-11-135-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | | hackishly add primary css class adaption for jquery uiArthur Schiwon2017-11-134-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | Merge pull request #7061 from kyrofa/bugfix/6028/app_path_realpathMorris Jobke2017-11-144-0/+304
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | {J,CS}SResourceLocator: account for symlinks in app path
| * | | | | | | JSResourceLocator: re-use $app_pathKyle Fazzari2017-11-121-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
| * | | | | | | tests: change helper scopeKyle Fazzari2017-11-082-46/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems to be the only way to have the same helpers used between tests in a manner that works for both standalone phpunit and autotest.sh. Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
| * | | | | | | JSResourceLocator: account for symlinks in app pathKyle Fazzari2017-11-073-3/+295
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>