summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-10-24210-178/+4660
* Merge pull request #6864 from nextcloud/phpdoc-fix-issuesMorris Jobke2017-10-2310-10/+10
|\
| * Revert copyright changesJulius Härtl2017-10-234-2/+5
| * Doc: Fix phpDoc issuesJulius Härtl2017-10-2314-15/+12
|/
* Merge pull request #6915 from nextcloud/css-border-radiusJoas Schilling2017-10-231-2/+0
|\
| * Border-radius does not need the vendor prefixes anymoreMorris Jobke2017-10-231-2/+0
* | Merge pull request #6916 from nextcloud/css-box-sizingJohn Molakvoæ2017-10-233-8/+0
|\ \
| * | Box-sizing does not need vendor prefix anymoreMorris Jobke2017-10-233-8/+0
| |/
* | Merge pull request #6917 from nextcloud/css-box-shadowJohn Molakvoæ2017-10-233-6/+0
|\ \
| * | Box-shadow does not need vendor prefix anymoreMorris Jobke2017-10-233-6/+0
| |/
* | Merge pull request #6780 from nextcloud/rakekniven-patch-1Morris Jobke2017-10-231-2/+2
|\ \
| * | Update file-upload.jsrakekniven2017-10-071-2/+2
* | | Merge pull request #6848 from nextcloud/user-app-nav-to-css-guidelinesJohn Molakvoæ2017-10-234-106/+49
|\ \ \
| * | | Fix deletion feedbackJohn Molakvoæ (skjnldsv)2017-10-212-2/+2
| * | | Fix editing form visibilityJohn Molakvoæ (skjnldsv)2017-10-211-1/+1
| * | | Edit form to guidelinesJohn Molakvoæ (skjnldsv)2017-10-213-62/+16
| * | | User settings app-navigation to css guidelinesJohn Molakvoæ (skjnldsv)2017-10-213-42/+31
* | | | Merge pull request #6892 from nextcloud/rakekniven-patch-2Lukas Reschke2017-10-231-1/+1
|\ \ \ \
| * | | | Update settings-admin-caldav.phprakekniven2017-10-211-1/+1
| |/ / /
* | | | Merge pull request #6913 from nextcloud/tests-for-6837Lukas Reschke2017-10-231-0/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Provide tests for future timestamp formattingMorris Jobke2017-10-231-0/+9
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-10-2310-6/+112
* | | Merge pull request #6758 from nextcloud/allow-0-quota-againblizzz2017-10-221-1/+1
|\ \ \
| * | | Allow quota of 0 againJoas Schilling2017-10-191-1/+1
* | | | [tx-robot] updated from transifexNextcloud bot2017-10-2212-6/+178
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-10-2126-12/+118
* | | [tx-robot] updated from transifexNextcloud bot2017-10-2020-4/+260
* | | Merge pull request #6873 from nextcloud/ldap_proxy_redix_fixLukas Reschke2017-10-191-19/+12
|\ \ \
| * | | Little bit of code cleanupRoeland Jago Douma2017-10-191-5/+5
| * | | Do not check existance before fetchRoeland Jago Douma2017-10-191-14/+7
* | | | Merge pull request #6811 from nextcloud/feature/noid/disable_caldav_invitationsJoas Schilling2017-10-197-3/+209
|\ \ \ \
| * | | | Make it possible to opt out of IMip Plugin for CalDAVGeorg Ehrke2017-10-162-2/+10
| * | | | add admin settings panel for dav appGeorg Ehrke2017-10-165-1/+199
* | | | | Merge pull request #6677 from nextcloud/downstream-dont-reset-quotaLukas Reschke2017-10-193-18/+12
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | and add missing whitespaces to log outoutArthur Schiwon2017-09-281-2/+2
| * | | | Adjust unittestJuan Pablo Villafáñez2017-09-281-15/+10
| * | | | Keep the current quota if no suitable quota is foundJuan Pablo Villafáñez2017-09-281-1/+0
* | | | | Merge pull request #6825 from nextcloud/no-filecache-updateLukas Reschke2017-10-196-17/+128
|\ \ \ \ \
| * | | | | Update autoloadingJoas Schilling2017-10-162-0/+2
| * | | | | Also update the activity table with thisJoas Schilling2017-10-131-0/+6
| * | | | | Add a command to manually migrate to big intsJoas Schilling2017-10-132-0/+102
| * | | | | Install new instances with bigint filecacheJoas Schilling2017-10-131-14/+15
| * | | | | Don't change the filecache schema on updateJoas Schilling2017-10-131-3/+3
* | | | | | Merge pull request #6835 from nextcloud/dav-plugins-from-apps-onlyLukas Reschke2017-10-195-4/+291
|\ \ \ \ \ \
| * | | | | | Dav: codestyle fixes in PluginManagerJulius Härtl2017-10-141-8/+8
| * | | | | | Let apps register Sabre plugins or collectionsVincent Petry2017-10-145-4/+291
* | | | | | | Merge pull request #6853 from nextcloud/apps_autoloaderLukas Reschke2017-10-1912-9/+721
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Ignore composer stuff in phanRoeland Jago Douma2017-10-171-0/+1
| * | | | | | Update autoload checkerRoeland Jago Douma2017-10-171-5/+14
| * | | | | | Move files_sharing to a proper classmapRoeland Jago Douma2017-10-179-0/+694