Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2763 from nextcloud/fix_maindetailsview_favorite_star-patch | Lukas Reschke | 2016-12-23 | 4 | -57/+19 |
|\ | | | | | [downstream] Fix maindetailsview favorite star patch | ||||
| * | OC.Uploader does not have a 'state' method, therefore the | Christoph Wurst | 2016-12-23 | 1 | -31/+0 |
| | | | | | | | | | | | | dead code can be removed Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | Fix indentation | Lukas Reschke | 2016-12-19 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | Style modifications of favorite star on main detail view (#26658) | Michael Jobst | 2016-12-19 | 3 | -26/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Style modifications of favorite star on main detail view * Removed unused opacity change on mouse over * favorite star title fixed * favorite star opacity should always be .7 Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | Just use moment to comupte the time left for the upload - translations are ↵ | Thomas Müller | 2016-12-22 | 1 | -37/+3 |
| | | | | | | | | | | | | delivered as part of moment.js - fixes #26804 Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-20 | 14 | -78/+296 |
|/ | |||||
* | Merge pull request #2689 from andreas-p/fix-remote-conflict | Lukas Reschke | 2016-12-19 | 1 | -1/+12 |
|\ | | | | | Fix showConflict | ||||
| * | Fix showConflict | pflug | 2016-12-19 | 1 | -1/+12 |
| | | | | | | | | | | | | | | use getFullFileName to show conflicting file add original.directory to make fileExists happy Signed-off-by: Andreas Pflug <dev@admin4.org> | ||||
* | | Remove leading slash from sharing activity | Joas Schilling | 2016-12-15 | 2 | -4/+6 |
|/ | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | Update app versions and requirements | Joas Schilling | 2016-12-13 | 1 | -2/+2 |
| | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-12 | 2 | -0/+60 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-10 | 4 | -0/+36 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-09 | 4 | -0/+20 |
| | |||||
* | Merge pull request #2545 from nextcloud/fix-popover-width | Roeland Jago Douma | 2016-12-08 | 1 | -8/+0 |
|\ | | | | | Fix popover width | ||||
| * | Fix popover margin and width | John Molakvoæ (skjnldsv) | 2016-12-07 | 1 | -8/+0 |
| | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-08 | 4 | -0/+20 |
| | | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-07 | 6 | -0/+30 |
| | | |||||
* | | fix type in jsdoc | Arthur Schiwon | 2016-12-06 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | Merge pull request #2496 from nextcloud/add-activities-for-favorite-managemet | Morris Jobke | 2016-12-05 | 9 | -23/+605 |
|\ | | | | | Add an activity when managing favorites | ||||
| * | Add tests for favorite action | Joas Schilling | 2016-12-04 | 1 | -8/+55 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Add some generic tests | Joas Schilling | 2016-12-04 | 3 | -0/+248 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Add an activity when managing favorites | Joas Schilling | 2016-12-04 | 5 | -15/+302 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | fix conflict dialog styling in firefox | Robin Appelman | 2016-12-05 | 1 | -7/+5 |
|/ | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-04 | 2 | -0/+14 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-03 | 4 | -2/+86 |
| | |||||
* | Merge pull request #2475 from nextcloud/fix-filename-local-link | Morris Jobke | 2016-12-02 | 1 | -6/+1 |
|\ | | | | | fix width of filename in sidebar to accommodate local link | ||||
| * | properly calculate the width of the name in the sidebar | Morris Jobke | 2016-12-02 | 1 | -6/+1 |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | fix width of filename in sidebar to accommodate local link | Jan-Christoph Borchardt | 2016-12-02 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | Increase width of new menu | Morris Jobke | 2016-12-02 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | fix vertical sizing change of popover in new folder flow | Jan-Christoph Borchardt | 2016-12-02 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | Fix input field for new folder - fixes #2245 | Morris Jobke | 2016-12-02 | 1 | -1/+2 |
|/ | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | Merge pull request #2432 from nextcloud/activity-mail-language | Morris Jobke | 2016-12-01 | 1 | -4/+11 |
|\ | | | | | Make sure the activity emails can be sent in the users language | ||||
| * | Adjust all implementations in the server repo | Joas Schilling | 2016-12-01 | 1 | -4/+11 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | Merge pull request #2444 from nextcloud/detect-also-a-400-status | Christoph Wurst | 2016-12-01 | 2 | -1/+6 |
|\ \ | | | | | | | Catch status code 400 | ||||
| * | | Catch status code 400 | Lukas Reschke | 2016-12-01 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | In case the server returns a statuscode 400 we should also gracefully return to the home directory. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | Merge pull request #2435 from nextcloud/sidebar-preview-non-preview | Roeland Jago Douma | 2016-12-01 | 1 | -3/+12 |
|\ \ \ | |/ / |/| | | allow registering sidebar preview handlers for mimetypes that dont co… | ||||
| * | | allow registering sidebar preview handlers for mimetypes that dont come with ↵ | Robin Appelman | 2016-12-01 | 1 | -3/+12 |
| | | | | | | | | | | | | | | | | | | server side previews Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | We should always show permanent actions | Roeland Jago Douma | 2016-12-01 | 1 | -7/+3 |
| |/ |/| | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-01 | 2 | -0/+38 |
| | | |||||
* | | Merge pull request #2422 from nextcloud/text-preview-debug | Robin Appelman | 2016-11-30 | 1 | -5/+1 |
|\ \ | | | | | | | remove js debug statements in sidebar text preview generator | ||||
| * | | remove js debug statements in sidebar text preview generator | Robin Appelman | 2016-11-30 | 1 | -5/+1 |
| |/ | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* / | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-30 | 6 | -0/+138 |
|/ | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-30 | 6 | -0/+96 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-29 | 6 | -2/+116 |
| | |||||
* | Fix mobile view | John Molakvoæ (skjnldsv) | 2016-11-29 | 1 | -5/+0 |
| | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-29 | 56 | -1252/+730 |
| | |||||
* | Merge pull request #2335 from nextcloud/grouping-for-activities | Morris Jobke | 2016-11-28 | 1 | -109/+84 |
|\ | | | | | Bring back grouping for activities | ||||
| * | Add an event merger and use it for the files activities | Joas Schilling | 2016-11-25 | 1 | -1/+16 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Working towards groups | Joas Schilling | 2016-11-25 | 1 | -108/+68 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | bring back permissions for mail shares | Bjoern Schiessle | 2016-11-28 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> |