Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make enabling/disabling apps work with the new menu | Julius Haertl | 2017-03-16 | 3 | -30/+67 |
| | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
* | Fix positioning of popovermenu | Julius Haertl | 2017-03-16 | 1 | -2/+6 |
| | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
* | Fix popover positioning after window resize | Julius Haertl | 2017-03-16 | 1 | -5/+13 |
| | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
* | Cleanup SCSS for app menu and fix mobile view | Julius Haertl | 2017-03-16 | 1 | -103/+91 |
| | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
* | Make app management icon act like a normal app icon | Julius Haertl | 2017-03-16 | 2 | -2/+9 |
| | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
* | Fix menu issues | Julius Haertl | 2017-03-16 | 4 | -61/+101 |
| | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
* | Generate seperate menu list for header bar | Julius Haertl | 2017-03-16 | 4 | -22/+73 |
| | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
* | Move active app to the first slot | Julius Haertl | 2017-03-16 | 1 | -9/+19 |
| | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
* | Show app icons in the header | Julius Haertl | 2017-03-16 | 3 | -5/+206 |
| | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
* | Merge pull request #3624 from marncz/master | Roeland Jago Douma | 2017-03-16 | 1 | -2/+15 |
|\ | | | | | Update.js: countdown feedback before redirect | ||||
| * | Spacing | Marcin Czarnecki | 2017-03-15 | 1 | -1/+1 |
| | | | | | | Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk> | ||||
| * | Update: feedback before redirect | Marcin Czarnecki | 2017-03-14 | 1 | -8/+9 |
| | | | | | | Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk> | ||||
| * | Update: feedback before redirect | Marcin Czarnecki | 2017-02-25 | 1 | -2/+14 |
| | | | | | | Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-16 | 96 | -114/+18 |
| | | |||||
* | | Merge pull request #3788 from nextcloud/fed-share-modify | Roeland Jago Douma | 2017-03-15 | 2 | -21/+59 |
|\ \ | | | | | | | Add api to change the remote of an incoming federated share | ||||
| * | | Add api to change the remote of an incoming federated share | Robin Appelman | 2017-03-10 | 2 | -21/+59 |
| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | Merge pull request #3843 from nextcloud/encryption-fix-mail-share | Joas Schilling | 2017-03-15 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | take share by mail into consideration if we calculate the access list | ||||
| * | | | take share by mail into consideration if we calculate the access list | Bjoern Schiessle | 2017-03-14 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | | Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-query | Roeland Jago Douma | 2017-03-15 | 2 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Remove single quotes around search query like in user search | ||||
| * | | | | Remove single quotes around search query like in user search | Joas Schilling | 2017-03-15 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | Merge pull request #3841 from nextcloud/encyryption-trash-bin | Björn Schießle | 2017-03-15 | 4 | -14/+34 |
|\ \ \ \ \ | | | | | | | | | | | | | Delete files on encryption error | ||||
| * | | | | | delete files right away in case of a encryption exception | Bjoern Schiessle | 2017-03-14 | 2 | -8/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | | | always throw a encryption exception | Bjoern Schiessle | 2017-03-14 | 2 | -6/+5 |
| | |/ / / | |/| | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-15 | 24 | -98/+220 |
| | | | | | |||||
* | | | | | Merge pull request #3838 from Xuanwo/basename-fix | Roeland Jago Douma | 2017-03-14 | 1 | -1/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | [OC/Files/Cache]: Fix wrong usage of basename | ||||
| * | | | | | [OC/Files/Cache]: Fix wrong usage of basename | Xuanwo | 2017-03-14 | 1 | -1/+2 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://github.com/nextcloud/server/issues/3837 Signed-off-by: Xuanwo <xuanwo@yunify.com> | ||||
* | | | | | Merge pull request #3829 from nextcloud/reshares-in-folder | Roeland Jago Douma | 2017-03-14 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | switch reshares to true (display reshares in the folder/filelist) | ||||
| * | | | | | fix mock | Maxence Lange | 2017-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | switch reshares to true | Maxence Lange | 2017-03-14 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com> | ||||
* | | | | | Merge pull request #3836 from nextcloud/do-not-double-check-app-update | Roeland Jago Douma | 2017-03-14 | 2 | -9/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Do not check for app update twice | ||||
| * | | | | | Do not double cherck app update | Morris Jobke | 2017-03-13 | 2 | -9/+4 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In base.php the apps are already checked for an update. No need to repeat this during loading of the app. Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | | Merge pull request #3600 from coletivoEITA/master | Roeland Jago Douma | 2017-03-14 | 4 | -2/+18 |
|\ \ \ \ \ | | | | | | | | | | | | | added method needsPartFile() in Storage | ||||
| * | | | | | added method needsPartFile() in Storage | Vinicius Cubas Brand | 2017-03-14 | 4 | -2/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com> | ||||
* | | | | | | Merge pull request #3783 from andrius-kulbis/master | Roeland Jago Douma | 2017-03-14 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix deleted objectstore shares | ||||
| * | | | | | | Fix detecting deleted shares in object store | Andrius | 2017-03-09 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | While using the object store, the shares, that are moved to trashbin were still detected as accessible and cause broken shares to be shown in file/folder listing. | ||||
* | | | | | | | Merge pull request #3824 from nextcloud/dav-search-getlastmodified | Robin Appelman | 2017-03-14 | 2 | -3/+9 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | fix searching and ordering on getlastmodified | ||||
| * | | | | | | safer casting of datetime | Robin Appelman | 2017-03-14 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | | | fix unit test | Morris Jobke | 2017-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | | | fix searching and ordering on getlastmodified | Robin Appelman | 2017-03-13 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-14 | 14 | -198/+266 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #3827 from ↵ | Morris Jobke | 2017-03-13 | 2 | -3/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/issue-3826-remove-double-password-confirmation Remove the double password confirmation on changing cron | ||||
| * | | | | | | | Remove the double password confirmation on changing cron | Joas Schilling | 2017-03-13 | 2 | -3/+7 |
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | | | Merge pull request #3828 from nextcloud/no-no-empty-wildcard-search | Lukas Reschke | 2017-03-13 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | dont allow empty wildcard search | ||||
| * | | | | | | | dont allow empty wildcard search | Robin Appelman | 2017-03-13 | 1 | -0/+4 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | | | | Merge pull request #3648 from nextcloud/sabre-3.2.2 | Lukas Reschke | 2017-03-13 | 3 | -9/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | [3rdparty] Bump sabre/dav to 3.2.2 | ||||
| * | | | | | | Make intergration tests work again | Roeland Jago Douma | 2017-03-10 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regex was to greedy Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | | Fix tests | Roeland Jago Douma | 2017-03-10 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | | | [3rdparty] Bump sabre/dav to 3.2.2 | Roeland Jago Douma | 2017-03-10 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | | | | Merge pull request #3822 from nextcloud/webui-upoad-no-mtime | Robin Appelman | 2017-03-13 | 1 | -5/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | dont preserve mtime when uploading trough the web interface | ||||
| * | | | | | | | dont preserve mtime when uploading trough the web interface | Robin Appelman | 2017-03-13 | 1 | -5/+0 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> |