summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #3620 from nextcloud/feature/1463/editable_color_name_for_...Morris Jobke2017-04-035-15/+207
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | OCA\DAV\Files\CustomPropertiesBackend -> OCA\DAV\DAV\CustomPropertiesBackendGeorg Ehrke2017-03-273-4/+4
| * | | | | | | | | allow sharees to edit certain calendar properties for themselvesGeorg Ehrke2017-03-274-13/+205
* | | | | | | | | | Merge pull request #4191 from nextcloud/bump-autosizeRoeland Jago Douma2017-04-036-533/+20
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Move to autosize.min.jsRoeland Jago Douma2017-04-035-555/+15
| * | | | | | | | | Bump autosize.jsRoeland Jago Douma2017-04-032-35/+62
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4166 from nextcloud/issue-4165-invalid-int-for-transparen...Roeland Jago Douma2017-04-031-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make sure transparency is an integer when saving a calendarJoas Schilling2017-03-301-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #4189 from nextcloud/add-issue-template-appJos Poortvliet2017-04-031-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update issue_template.mdJos Poortvliet2017-04-031-1/+1
| * | | | | | | | | Add reference to issue template appLukas Reschke2017-04-021-3/+4
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4131 from nextcloud/fix-jscombinerChristoph Wurst2017-04-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix check for cache value in JSCombinerMorris Jobke2017-03-281-1/+1
* | | | | | | | | | Merge pull request #4175 from nextcloud/fix-socialmenudisplayRoeland Jago Douma2017-04-031-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Do not show social menu when there is no link shareRoeland Jago Douma2017-03-311-1/+1
* | | | | | | | | | [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