summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3948 from nextcloud/downstream-27271Lukas Reschke2017-03-231-3/+8
|\ | | | | Tooltip in trashbin with previous location
| * fix path for files from root folderMorris Jobke2017-03-221-1/+5
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * In the real world id is an initial filenameVictor Dubiniuk2017-03-201-3/+4
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #3978 from nextcloud/scss_deps_memcacheLukas Reschke2017-03-233-41/+116
|\ \ | | | | | | Cache SCSS dependency file in memcache
| * | Fix testsRoeland Jago Douma2017-03-221-31/+89
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Cache SCSS dependency file in memcacheRoeland Jago Douma2017-03-223-11/+28
| | | | | | | | | | | | | | | | | | | | | Since reading a file from disks can be costly. Lets store the dependency json also in memcache. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #3989 from nextcloud/files-external-save-buttonLukas Reschke2017-03-233-18/+17
|\ \ \ | | | | | | | | replace autosave with a save button for external storage configuration
| * | | replace autosave with a save button for external storage configurationRobin Appelman2017-03-223-18/+17
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #3994 from nextcloud/only_init_backbone_onceLukas Reschke2017-03-231-1/+0
|\ \ \ \ | | | | | | | | | | Only initialize backbone once
| * | | | Only initialize backbone onceRoeland Jago Douma2017-03-221-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #3997 from nextcloud/backport-27353Roeland Jago Douma2017-03-233-26/+84
|\ \ \ \ \ | | | | | | | | | | | | Update davclient.js to 0.1.1
| * | | | | Update davclient.js to 0.1.1Vincent Petry2017-03-223-26/+84
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3999 from nextcloud/backport-27262Morris Jobke2017-03-233-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updated UI messages relating to the encryption functionality
| * | | | | | Updated UI messages relating to the encryption functionalityMatthew Setter2017-03-223-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for updating these messages, is that grammatically they're not quite correct. They showed a combination of: - Related phrases, which could be either separated or joined better - Related sentences, but which should be expressed as separate ones They were also missing full-stops to end the them. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / / / / [tx-robot] updated from transifexNextcloud bot2017-03-2310-2/+52
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-2262-20/+348
| | | | |
* | | | | Merge pull request #3497 from nextcloud/mount-shared-lastMorris Jobke2017-03-224-4/+52
|\ \ \ \ \ | |_|_|/ / |/| | | | mount shared mounts last
| * | | | add integration test to ensure that shares dont overwrite external storagesRobin Appelman2017-03-222-2/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | mount shared mounts lastRobin Appelman2017-03-222-2/+34
| | |/ / | |/| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #3990 from nextcloud/remove-owncloud-root-cert-as-per-todoRoeland Jago Douma2017-03-221-66/+0
|\ \ \ \ | |_|/ / |/| | | Remove the ownCloud Root Authority file as well
| * | | Remove the cert as wellJoas Schilling2017-03-221-66/+0
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #3992 from nextcloud/revert-3795-bundle_vendor_jsMorris Jobke2017-03-227-42634/+16
|\ \ \ \ | | | | | | | | | | Revert "Bundle vendor js"
| * | | | Revert "Bundle vendor js"Roeland Jago Douma2017-03-227-42634/+16
|/ / / /
* | | | Merge pull request #3977 from nextcloud/di_ng2blizzz2017-03-227-19/+65
|\ \ \ \ | | | | | | | | | | Make DI work for all apps
| * | | | Register the namespace with the autoloading to allow reverse recoveryJoas Schilling2017-03-222-7/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Also cache the namespace from appinfoJoas Schilling2017-03-221-3/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Add the AppContainerRoeland Jago Douma2017-03-221-0/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Don't do a recursive searchJoas Schilling2017-03-224-3/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | buildAppNamespace already has the fallbackJoas Schilling2017-03-221-11/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Make DI work for all appsRoeland Jago Douma2017-03-211-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As stated in https://github.com/nextcloud/server/pull/3901#issuecomment-288135309 appid's don't have to match the namespace. Work around this Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #3795 from nextcloud/bundle_vendor_jsRoeland Jago Douma2017-03-227-16/+42634
|\ \ \ \ \ | |_|_|/ / |/| | | | Bundle vendor js
| * | | | Handlebars is already loaded by core.jsRoeland Jago Douma2017-03-221-2/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | When debug don't load the bundled fileRoeland Jago Douma2017-03-221-2/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | No need to exitRoeland Jago Douma2017-03-221-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Bump core.jsRoeland Jago Douma2017-03-221-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Add CI step to verify merged vendor jsRoeland Jago Douma2017-03-222-0/+34
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Bundle more default vendor jsRoeland Jago Douma2017-03-223-5/+4236
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Merge vendor jsRoeland Jago Douma2017-03-223-14/+38352
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a bunch of javascript we always load from vendors. This combines this into 1 javascript file. Which reduces the number of request by ~10. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #3983 from nextcloud/remove-owncloud-root-cert-as-per-todoRoeland Jago Douma2017-03-221-8/+1
|\ \ \ \ | | |/ / | |/| | Remove ownCloud Root Authority as per todo
| * | | Remove ownCloud Root Authority as per todoJoas Schilling2017-03-221-8/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #3982 from nextcloud/hide-systemtag-delete-tooltipRoeland Jago Douma2017-03-221-0/+1
|\ \ \ \ | |/ / / |/| | | Remove tooltip of delete button for systemtags
| * | | Remove tooltip of delete button for systemtagsMorris Jobke2017-03-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | * fixes #3967 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #3972 from nextcloud/merge-some-more-cssRoeland Jago Douma2017-03-2215-13/+13
|\ \ \ \ | | | | | | | | | | Merge some CSS files using our SCSS compiler
| * | | | fix pathMorris Jobke2017-03-212-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Merge some CSS files using our SCSS compilerLukas Reschke2017-03-2115-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves around 4 requests on the average page load. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #3980 from nextcloud/fix-app-menu-triangleChristoph Wurst2017-03-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix position of triangle in app menu
| * | | | | Fix position of triangle in app menuMorris Jobke2017-03-211-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-2262-52/+272
| |_|/ / |/| | |
* | | | Merge pull request #3974 from nextcloud/fix-reshare-activity-messageMorris Jobke2017-03-211-1/+1
|\ \ \ \ | |/ / / |/| | | Fix reshare with user activity message
| * | | Fix reshare with user activity messageJoas Schilling2017-03-211-1/+1
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 06:29:08 +0000