summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make enabling/disabling apps work with the new menuJulius Haertl2017-03-163-30/+67
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Fix positioning of popovermenuJulius Haertl2017-03-161-2/+6
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Fix popover positioning after window resizeJulius Haertl2017-03-161-5/+13
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Cleanup SCSS for app menu and fix mobile viewJulius Haertl2017-03-161-103/+91
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Make app management icon act like a normal app iconJulius Haertl2017-03-162-2/+9
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Fix menu issuesJulius Haertl2017-03-164-61/+101
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Generate seperate menu list for header barJulius Haertl2017-03-164-22/+73
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Move active app to the first slotJulius Haertl2017-03-161-9/+19
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Show app icons in the headerJulius Haertl2017-03-163-5/+206
| | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* Merge pull request #3624 from marncz/masterRoeland Jago Douma2017-03-161-2/+15
|\ | | | | Update.js: countdown feedback before redirect
| * SpacingMarcin Czarnecki2017-03-151-1/+1
| | | | | | Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
| * Update: feedback before redirectMarcin Czarnecki2017-03-141-8/+9
| | | | | | Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
| * Update: feedback before redirectMarcin Czarnecki2017-02-251-2/+14
| | | | | | Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
* | [tx-robot] updated from transifexNextcloud bot2017-03-1696-114/+18
| |
* | Merge pull request #3788 from nextcloud/fed-share-modifyRoeland Jago Douma2017-03-152-21/+59
|\ \ | | | | | | Add api to change the remote of an incoming federated share
| * | Add api to change the remote of an incoming federated shareRobin Appelman2017-03-102-21/+59
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #3843 from nextcloud/encryption-fix-mail-shareJoas Schilling2017-03-151-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 listBjoern Schiessle2017-03-141-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-queryRoeland Jago Douma2017-03-152-4/+4
|\ \ \ \ | | | | | | | | | | Remove single quotes around search query like in user search
| * | | | Remove single quotes around search query like in user searchJoas Schilling2017-03-152-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #3841 from nextcloud/encyryption-trash-binBjörn Schießle2017-03-154-14/+34
|\ \ \ \ \ | | | | | | | | | | | | Delete files on encryption error
| * | | | | delete files right away in case of a encryption exceptionBjoern Schiessle2017-03-142-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | always throw a encryption exceptionBjoern Schiessle2017-03-142-6/+5
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-1524-98/+220
| | | | |
* | | | | Merge pull request #3838 from Xuanwo/basename-fixRoeland Jago Douma2017-03-141-1/+2
|\ \ \ \ \ | | | | | | | | | | | | [OC/Files/Cache]: Fix wrong usage of basename
| * | | | | [OC/Files/Cache]: Fix wrong usage of basenameXuanwo2017-03-141-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-folderRoeland Jago Douma2017-03-142-2/+2
|\ \ \ \ \ | | | | | | | | | | | | switch reshares to true (display reshares in the folder/filelist)
| * | | | | fix mockMaxence Lange2017-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | switch reshares to trueMaxence Lange2017-03-141-1/+1
|/ / / / / | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | | | | Merge pull request #3836 from nextcloud/do-not-double-check-app-updateRoeland Jago Douma2017-03-142-9/+4
|\ \ \ \ \ | | | | | | | | | | | | Do not check for app update twice
| * | | | | Do not double cherck app updateMorris Jobke2017-03-132-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/masterRoeland Jago Douma2017-03-144-2/+18
|\ \ \ \ \ | | | | | | | | | | | | added method needsPartFile() in Storage
| * | | | | added method needsPartFile() in StorageVinicius Cubas Brand2017-03-144-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
* | | | | | Merge pull request #3783 from andrius-kulbis/masterRoeland Jago Douma2017-03-141-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix deleted objectstore shares
| * | | | | | Fix detecting deleted shares in object storeAndrius2017-03-091-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-getlastmodifiedRobin Appelman2017-03-142-3/+9
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | fix searching and ordering on getlastmodified
| * | | | | | safer casting of datetimeRobin Appelman2017-03-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | fix unit testMorris Jobke2017-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | fix searching and ordering on getlastmodifiedRobin Appelman2017-03-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-1414-198/+266
| | | | | | |
* | | | | | | Merge pull request #3827 from ↵Morris Jobke2017-03-132-3/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/issue-3826-remove-double-password-confirmation Remove the double password confirmation on changing cron
| * | | | | | | Remove the double password confirmation on changing cronJoas Schilling2017-03-132-3/+7
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #3828 from nextcloud/no-no-empty-wildcard-searchLukas Reschke2017-03-131-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | dont allow empty wildcard search
| * | | | | | | dont allow empty wildcard searchRobin Appelman2017-03-131-0/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #3648 from nextcloud/sabre-3.2.2Lukas Reschke2017-03-133-9/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [3rdparty] Bump sabre/dav to 3.2.2
| * | | | | | Make intergration tests work againRoeland Jago Douma2017-03-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regex was to greedy Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Fix testsRoeland Jago Douma2017-03-101-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | [3rdparty] Bump sabre/dav to 3.2.2Roeland Jago Douma2017-03-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #3822 from nextcloud/webui-upoad-no-mtimeRobin Appelman2017-03-131-5/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | dont preserve mtime when uploading trough the web interface
| * | | | | | | dont preserve mtime when uploading trough the web interfaceRobin Appelman2017-03-131-5/+0
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>