summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-12-2656-636/+564
* Merge pull request #2763 from nextcloud/fix_maindetailsview_favorite_star-patchLukas Reschke2016-12-234-57/+19
|\
| * OC.Uploader does not have a 'state' method, therefore theChristoph Wurst2016-12-231-31/+0
| * Fix indentationLukas Reschke2016-12-191-1/+1
| * Style modifications of favorite star on main detail view (#26658)Michael Jobst2016-12-193-26/+19
* | Just use moment to comupte the time left for the upload - translations are de...Thomas Müller2016-12-221-37/+3
* | [tx-robot] updated from transifexNextcloud bot2016-12-2014-78/+296
|/
* Merge pull request #2689 from andreas-p/fix-remote-conflictLukas Reschke2016-12-191-1/+12
|\
| * Fix showConflictpflug2016-12-191-1/+12
* | Remove leading slash from sharing activityJoas Schilling2016-12-152-4/+6
|/
* Update app versions and requirementsJoas Schilling2016-12-131-2/+2
* [tx-robot] updated from transifexNextcloud bot2016-12-122-0/+60
* [tx-robot] updated from transifexNextcloud bot2016-12-104-0/+36
* [tx-robot] updated from transifexNextcloud bot2016-12-094-0/+20
* Merge pull request #2545 from nextcloud/fix-popover-widthRoeland Jago Douma2016-12-081-8/+0
|\
| * Fix popover margin and widthJohn Molakvoæ (skjnldsv)2016-12-071-8/+0
* | [tx-robot] updated from transifexNextcloud bot2016-12-084-0/+20
* | [tx-robot] updated from transifexNextcloud bot2016-12-076-0/+30
* | fix type in jsdocArthur Schiwon2016-12-061-1/+1
|/
* Merge pull request #2496 from nextcloud/add-activities-for-favorite-managemetMorris Jobke2016-12-059-23/+605
|\
| * Add tests for favorite actionJoas Schilling2016-12-041-8/+55
| * Add some generic testsJoas Schilling2016-12-043-0/+248
| * Add an activity when managing favoritesJoas Schilling2016-12-045-15/+302
* | fix conflict dialog styling in firefoxRobin Appelman2016-12-051-7/+5
|/
* [tx-robot] updated from transifexNextcloud bot2016-12-042-0/+14
* [tx-robot] updated from transifexNextcloud bot2016-12-034-2/+86
* Merge pull request #2475 from nextcloud/fix-filename-local-linkMorris Jobke2016-12-021-6/+1
|\
| * properly calculate the width of the name in the sidebarMorris Jobke2016-12-021-6/+1
| * fix width of filename in sidebar to accommodate local linkJan-Christoph Borchardt2016-12-021-1/+1
* | Increase width of new menuMorris Jobke2016-12-021-1/+1
* | fix vertical sizing change of popover in new folder flowJan-Christoph Borchardt2016-12-021-0/+1
* | Fix input field for new folder - fixes #2245Morris Jobke2016-12-021-1/+2
|/
* Merge pull request #2432 from nextcloud/activity-mail-languageMorris Jobke2016-12-011-4/+11
|\
| * Adjust all implementations in the server repoJoas Schilling2016-12-011-4/+11
* | Merge pull request #2444 from nextcloud/detect-also-a-400-statusChristoph Wurst2016-12-012-1/+6
|\ \
| * | Catch status code 400Lukas Reschke2016-12-012-1/+6
* | | Merge pull request #2435 from nextcloud/sidebar-preview-non-previewRoeland Jago Douma2016-12-011-3/+12
|\ \ \ | |/ / |/| |
| * | allow registering sidebar preview handlers for mimetypes that dont come with ...Robin Appelman2016-12-011-3/+12
* | | We should always show permanent actionsRoeland Jago Douma2016-12-011-7/+3
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2016-12-012-0/+38
* | Merge pull request #2422 from nextcloud/text-preview-debugRobin Appelman2016-11-301-5/+1
|\ \
| * | remove js debug statements in sidebar text preview generatorRobin Appelman2016-11-301-5/+1
| |/
* / [tx-robot] updated from transifexNextcloud bot2016-11-306-0/+138
|/
* [tx-robot] updated from transifexNextcloud bot2016-11-306-0/+96
* [tx-robot] updated from transifexNextcloud bot2016-11-296-2/+116
* Fix mobile viewJohn Molakvoæ (skjnldsv)2016-11-291-5/+0
* [tx-robot] updated from transifexNextcloud bot2016-11-2956-1252/+730
* Merge pull request #2335 from nextcloud/grouping-for-activitiesMorris Jobke2016-11-281-109/+84
|\
| * Add an event merger and use it for the files activitiesJoas Schilling2016-11-251-1/+16
| * Working towards groupsJoas Schilling2016-11-251-108/+68