summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3791 from nextcloud/combine_sassLukas Reschke2017-03-097-14/+30
|\ | | | | Combine sass
| * Add more styles to the server.scssMorris Jobke2017-03-096-9/+9
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * [PoC] combine 2 scss files!Roeland Jago Douma2017-03-092-2/+3
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Allow using import in sass filesRoeland Jago Douma2017-03-091-3/+18
| | | | | | | | | | | | | | | | | | This allows us to combine multiple sass files that we have to always load together anyway. Fixes #3389 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #3693 from nextcloud/get-user-folder-of-correct-userRoeland Jago Douma2017-03-093-51/+68
|\ \ | | | | | | Get the user folder of the correct user for mention notifications
| * | Get the user folder of the correct userJoas Schilling2017-03-093-51/+68
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #3621 from kuimovvg/masterRoeland Jago Douma2017-03-091-0/+1
|\ \ \ | |/ / |/| | don't setted status when file is lock
| * | don't setted status when file is lockvkuimov2017-02-251-0/+1
| | |
* | | Merge pull request #3785 from nextcloud/bump_autoloaderMorris Jobke2017-03-092-4/+8
|\ \ \ | | | | | | | | Bump autoloader
| * | | Bump autoloaderRoeland Jago Douma2017-03-092-4/+8
| | |/ | |/| | | | | | | | | | | | | Composer was updated so lets update the autoloader Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #3611 from nextcloud/announce-trsuted-server-endpointsBjörn Schießle2017-03-093-2/+95
|\ \ \ | |/ / |/| | Announce trusted server endpoints
| * | add and adjust unit testsBjoern Schiessle2017-03-091-2/+64
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | announce public endpoints to sync trusted serversBjoern Schiessle2017-03-091-0/+17
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | add new routes for trusted servers which are more align with the other ↵Bjoern Schiessle2017-03-091-0/+14
| | | | | | | | | | | | | | | | | | end-points Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #3754 from trustelem/user_saml-samesite-excludeLukas Reschke2017-03-091-1/+1
|\ \ \ | | | | | | | | Extend Same Site cookie user_saml exemption rule
| * | | Extend Same Site cookie user_saml exemption ruleVincent Vanackere2017-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current check does not trigger if $request->getRequestUri() does not return index.php as a prefix (on my config this was occuring using nginx to serve Nextcloud) Signed-off-by: Vincent Vanackere <vincent.vanackere@trustelem.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-0912-2/+106
| | | |
* | | | Merge pull request #3360 from nextcloud/dav-searchRobin Appelman2017-03-0826-25/+1598
|\ \ \ \ | | | | | | | | | | Implement webdav SEARCH
| * | | | update 3rdparty submoduleMorris Jobke2017-03-011-0/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | autoloaderRobin Appelman2017-03-012-0/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | add tests for filesearchbackendRobin Appelman2017-03-013-7/+306
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | add tests for searchQueryRobin Appelman2017-03-012-15/+62
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | Implement webdav SEARCHRobin Appelman2017-03-0118-33/+609
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | add icewind/searchdavRobin Appelman2017-02-2813-0/+631
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #3757 from nextcloud/issue-2887-no-subsystem-for-lockingRoeland Jago Douma2017-03-082-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Add new user agent of windows 10 dav backend
| * | | | | Set a status code when setting a bodyJoas Schilling2017-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Add new user agent of windows 10 dav backendJoas Schilling2017-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks Microsoft Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3725 from ↵Roeland Jago Douma2017-03-082-1/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/issue-fac-55-mimetype-detection-on-public-uploads Fix mimetype detection on public uploads for the workflow engine
| * | | | | | Fix admin panel missing some JS filesJoas Schilling2017-03-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Fix mimetype detection on public uploads for the workflow engineJoas Schilling2017-03-061-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-0810-6/+60
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #3671 from nextcloud/1070-user-management-no-resultsJoas Schilling2017-03-072-0/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | FIX: Add feedback on user settings when no results
| * | | | | | clean search when new user is addedgiorgia2017-03-032-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: giorgia <g.sambrotta@gmail.com>
| * | | | | | add emptycontent div, show/hide emptycontent div, fix #1070giorgia2017-03-032-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: giorgia <g.sambrotta@gmail.com>
* | | | | | | Merge pull request #3747 from nextcloud/design/input-tel-stylingJoas Schilling2017-03-071-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Apply text input styling to 'tel' inputs too
| * | | | | | Apply text input styling to 'tel' inputs tooChristoph Wurst2017-03-071-0/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #3744 from nextcloud/fix-avatar-buttonsRobin Appelman2017-03-071-1/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Avatar button layout improvements
| * | | | | Avatar button layout improvementsMorris Jobke2017-03-061-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #3736 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3743 from nextcloud/MorrisJobke-patch-1Roeland Jago Douma2017-03-071-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Only run drone on master/stable branches
| * | | | | Run drone only on master/stable branchesMorris Jobke2017-03-061-0/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #3729 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | / / / [tx-robot] updated from transifexNextcloud bot2017-03-074-8/+38
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-0614-8/+220
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-0512-16/+336
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-0422-2/+1086
|/ / /
* | | Merge pull request #3597 from nextcloud/remove-data-from-lookup-serverRoeland Jago Douma2017-03-031-19/+30
|\ \ \ | | | | | | | | add posibility to remove all personal data from lookup server
| * | | add posibility to remove all personal data from lookup serverBjoern Schiessle2017-02-231-19/+30
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #3684 from nextcloud/run-lang-update-only-onceRoeland Jago Douma2017-03-033-4/+44
|\ \ \ \ | | | | | | | | | | Execute UpdateLanguageCode only once
| * | | | Fix DIJoas Schilling2017-03-032-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Make the test usefulJoas Schilling2017-03-031-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Execute UpdateLanguageCode only onceMorris Jobke2017-03-022-2/+39
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>