summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* We are working on 13 now!Roeland Jago Douma2017-05-221-4/+3
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #5009 from nextcloud/update-acceptance-tests-for-issue-4921Roeland Jago Douma2017-05-221-1/+10
|\ | | | | Update acceptance tests for issue #4921
| * Update acceptance tests for issue #4921Daniel Calviño Sánchez2017-05-211-1/+10
| | | | | | | | | | | | | | | | | | Acceptance tests opened the details view by clicking on the middle of the file row, but due to the changes made in issue #4921 that now opens the file instead; this commit updates the acceptance tests to open the details view through the "Details" item in the file actions menu. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | [tx-robot] updated from transifexNextcloud bot2017-05-2232-40/+112
| |
* | Merge pull request #5007 from nextcloud/fix_scss_cacheLukas Reschke2017-05-212-2/+4
|\ \ | | | | | | Fix scss cache
| * | Increase versionRoeland Jago Douma2017-05-211-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Set SCSS dependencies to memcache on compileRoeland Jago Douma2017-05-211-1/+3
|/ / | | | | | | | | | | | | Else when an upgrade happens we will recompile all the SCSS files all the time (until the cache expires). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | v12.0.0Lukas Reschke2017-05-211-2/+2
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #4983 from nextcloud/master-oauth-not-disableMorris Jobke2017-05-203-6/+16
|\ \ | | | | | | Mark OAuth app as always enabled
| * | Fix testsLukas Reschke2017-05-202-6/+15
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Mark OAuth app as always enabledLukas Reschke2017-05-191-0/+1
| | | | | | | | | | | | | | | | | | At the moment we don't support disabling the OAuth app Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | [tx-robot] updated from transifexNextcloud bot2017-05-2120-4/+704
| | |
* | | Merge pull request #4997 from nextcloud/federated-share-fixMorris Jobke2017-05-201-0/+1
|\ \ \ | | | | | | | | fix for sharing
| * | | fix for sharingDaniel Hansson2017-05-201-0/+1
| | |/ | |/| | | | | | | Signed-off-by: Daniel Hansson <daniel@techandme.se>
* | | Merge pull request #4854 from michaelletzgus/deferred-script-loading-v2Morris Jobke2017-05-205-24/+44
|\ \ \ | | | | | | | | Make page loading faster, deferred script loading, now switchable:
| * | | Make page loading faster by deferred script loading:Michael Letzgus2017-05-205-24/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create generalized function for emmitting <script defer src=""> tags to templates * Remove type attribute from inline_js * Add defer attribute to external <script> tags Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
* | | | Merge pull request #4995 from nextcloud/master-version-dumpLukas Reschke2017-05-201-2/+2
|\ \ \ \ | |_|/ / |/| | | 12.0.0RC3
| * | | 12.0.0RC3Lukas Reschke2017-05-201-2/+2
|/ / / | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | [tx-robot] updated from transifexNextcloud bot2017-05-20118-104/+574
| | |
* | | Merge pull request #4981 from ↵Morris Jobke2017-05-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix-missing-argument-2-getAppContainer-master Fix missing argument 2 for Settings classes
| * | | Fix missing argument 2 for Settings classesJoas Schilling2017-05-191-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #4943 from nextcloud/rename-secure-dropBjörn Schießle2017-05-192-2/+2
|\ \ \ \ | | | | | | | | | | rename secure drop back to files drop
| * | | | rename secure drop back to files drop because of name collision with ↵Bjoern Schiessle2017-05-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | securedrop.org Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | Merge pull request #4974 from nextcloud/fix-hidden-sidebarLukas Reschke2017-05-191-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Fixes visible sidebar even if hidden is applied
| * | | | | Fixes visible sidebar even if hidden is appliedMorris Jobke2017-05-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4972 from nextcloud/fix-group-restrictionLukas Reschke2017-05-192-9/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix group restriction regression
| * | | | | Fix group restriction regressionMorris Jobke2017-05-192-9/+9
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | 12.0.0RC2Lukas Reschke2017-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #4910 from nextcloud/make-the-logo-smaller-creamLukas Reschke2017-05-193-7/+15
|\ \ \ \ \ | |/ / / / |/| | | | Fix logo being too big on log in page, fix #4585
| * | | | Scale logo only for custom onesJulius Härtl2017-05-193-5/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix logo being too big on log in page, fix #4585Jan-Christoph Borchardt2017-05-161-2/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #4956 from nextcloud/endless-loop-on-invalid-assetRoeland Jago Douma2017-05-193-0/+26
|\ \ \ \ \ | | | | | | | | | | | | Stop infinit loop on invalid settings css/js file
| * | | | | Stop infinit loop on invalid settings css/js fileJoas Schilling2017-05-193-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to find dirname of false... Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #4970 from franga2000/patch-1Lukas Reschke2017-05-191-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fixed typo
| * | | | | Fixed typoMiha Frangez2017-05-191-1/+1
|/ / / / /
* | | | | Merge pull request #4905 from nextcloud/auto-di-for-apps-without-app.phpJoas Schilling2017-05-191-2/+18
|\ \ \ \ \ | | | | | | | | | | | | Allow automatic DI for apps that don't register the container in app.php
| * | | | | Allow automatic DI for apps that don't register the container in app.phpJoas Schilling2017-05-161-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #4950 from nextcloud/master-workaround-4948Lukas Reschke2017-05-191-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Lowercase the scriptname again
| * | | | | Lowercase the scriptname againLukas Reschke2017-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref https://github.com/nextcloud/server/issues/4948 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4951 from nextcloud/transifex-oauth2Morris Jobke2017-05-182-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add oauth2 to transifex
| * | | | | | Add oauth2 to transifexMorris Jobke2017-05-182-0/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / / / / [tx-robot] updated from transifexNextcloud bot2017-05-19116-224/+270
|/ / / / /
* | | | | 12.0.0RC1Lukas Reschke2017-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #4894 from nextcloud/generic-security-activitiesLukas Reschke2017-05-1914-54/+60
|\ \ \ \ \ | | | | | | | | | | | | Change 2FA activities to more generic security activities
| * | | | | Update autoloaderRoeland Jago Douma2017-05-182-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix testsRoeland Jago Douma2017-05-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix backup codes activity typeChristoph Wurst2017-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | Publish 2fa backup codes activities to the right streamChristoph Wurst2017-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | Move activities test codeChristoph Wurst2017-05-183-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | Change 2FA activities to more generic security activitiesChristoph Wurst2017-05-186-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 15:02:53 +0000