aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* endorseLinkPassword changed to enableLinkPasswordByDefaultTimo Benk2017-04-032-2/+2
* feature endorse password for share linksTimo Benk2017-04-032-1/+2
* feature endorse password for share linksBjoern Schiessle2017-04-033-1/+8
* [tx-robot] updated from transifexNextcloud bot2017-04-0332-24/+204
* Merge pull request #4183 from nextcloud/css-shortcuts-viewLukas Reschke2017-04-021-1/+30
|\
| * Add CSS for styling of keyboard shortcuts viewJan-Christoph Borchardt2017-03-301-1/+30
* | [tx-robot] updated from transifexNextcloud bot2017-04-0218-2/+64
* | Merge pull request #4139 from nextcloud/phpseclibRoeland Jago Douma2017-04-011-0/+0
|\ \
| * | [3rdparty] Bump phpseclib to 2.0.4Roeland Jago Douma2017-03-301-0/+0
* | | Merge pull request #4174 from nextcloud/mergejs-newlineChristoph Wurst2017-04-012-7/+24
|\ \ \
| * | | mergejs should print a newline between importsRoeland Jago Douma2017-03-312-7/+24
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-0126-200/+1036
|/ / /
* | | Merge pull request #3438 from nextcloud/external-storage-user-folderRoeland Jago Douma2017-03-312-2/+2
|\ \ \
| * | | Allow using '/' as external storage rootRobin Appelman2017-03-232-2/+2
* | | | Merge pull request #4140 from nextcloud/no_encryption_no_wrapperBjörn Schießle2017-03-312-3/+6
|\ \ \ \
| * | | | fix setup of external storage integration testsRobin Appelman2017-03-301-1/+1
| * | | | Don't add the Encryption Storage Wrapper if there are no encryption modulesRoeland Jago Douma2017-03-291-2/+5
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-3154-224/+568
* | | | | Merge pull request #3832 from nextcloud/fix_1303Roeland Jago Douma2017-03-301-0/+4
|\ \ \ \ \
| * | | | | Do not clear CSRF token on logout (fix for #1303)Roeland Jago Douma2017-03-131-0/+4
* | | | | | Merge pull request #4150 from nextcloud/capped-memcache-pushJoas Schilling2017-03-302-2/+7
|\ \ \ \ \ \
| * | | | | | user ids are stringsRobin Appelman2017-03-301-1/+2
| * | | | | | support pushing to CappedMemoryCacheRobin Appelman2017-03-301-1/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #4128 from nextcloud/updateclipboardJoas Schilling2017-03-306-1485/+15
|\ \ \ \ \ \
| * | | | | | Use minified clipboard.jsRoeland Jago Douma2017-03-295-1517/+11
| * | | | | | Update clipboard.jsRoeland Jago Douma2017-03-292-210/+246
* | | | | | | Merge pull request #4143 from nextcloud/ldap-downstream-64Roeland Jago Douma2017-03-302-32/+366
|\ \ \ \ \ \ \
| * | | | | | | Include tests for "default" and "none" quotasJuan Pablo Villafáñez2017-03-291-0/+80
| * | | | | | | Add comments in the updateQuota method to explain the behaviorJuan Pablo Villafáñez2017-03-291-0/+14
| * | | | | | | Add new testes to cover more casesJuan Pablo Villafáñez2017-03-291-0/+210
| * | | | | | | Adjust current tests to match the expectationsJuan Pablo Villafáñez2017-03-291-28/+26
| * | | | | | | Check if the user exists before trying to set the quotaJuan Pablo Villafáñez2017-03-291-4/+9
| * | | | | | | Correctly apply quotaJuan Pablo Villafáñez2017-03-291-6/+33
* | | | | | | | Merge pull request #3089 from nextcloud/cache-move-single-queryRoeland Jago Douma2017-03-3018-28/+542
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | rename fun to funcRobin Appelman2017-03-304-7/+7
| * | | | | | | Add tests for query builder (i)likeRobin Appelman2017-03-302-1/+107
| * | | | | | | dont double escapeRobin Appelman2017-03-302-2/+0
| * | | | | | | update autoloaderRobin Appelman2017-03-302-0/+12
| * | | | | | | fix licence headersRobin Appelman2017-03-306-48/+54
| * | | | | | | Move all children of a folder in a single queryRobin Appelman2017-03-301-18/+27
| * | | | | | | Add function builder to the query builderRobin Appelman2017-03-308-0/+326
| * | | | | | | add support for escaping like parameters when using the query builderRobin Appelman2017-03-304-8/+62
| * | | | | | | Add MD5() to sqliteRobin Appelman2017-03-301-0/+3
|/ / / / / / /
* | | | | | | Merge pull request #4132 from nextcloud/fix-safari-gzipLukas Reschke2017-03-308-18/+18
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix gzip files for SafariMorris Jobke2017-03-298-18/+18
* | | | | | | Merge pull request #4100 from nextcloud/header-indicatorMorris Jobke2017-03-292-2/+26
|\ \ \ \ \ \ \
| * | | | | | | adjust opacity of search and gear icons in headerJan-Christoph Borchardt2017-03-272-2/+7
| * | | | | | | add pointer finger to full clickable app icon areaJan-Christoph Borchardt2017-03-271-0/+1
| * | | | | | | show triangle below user menu too when an entry inside there is activeJan-Christoph Borchardt2017-03-271-0/+18
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-3098-308/+402