summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge pull request #1823 from nextcloud/filepicker-folder-fixRoeland Jago Douma2016-10-251-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix picking a folder with the filepickerRobin Appelman2016-10-201-1/+4
* | | | | | | | | | | | | | Merge pull request #1860 from ryanwr/feature-sort-favoriteRoeland Jago Douma2016-10-253-7/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Sort favorite files first Issue #1802ryanwr2016-10-243-7/+21
* | | | | | | | | | | | | | | Merge pull request #1850 from nextcloud/filepicker-empty-folderRoeland Jago Douma2016-10-253-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | show empty folder message in filepickerRobin Appelman2016-10-213-1/+20
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1829 from nextcloud/downstream-26256Morris Jobke2016-10-244-4/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remove unneeded stepsMorris Jobke2016-10-211-2/+0
| * | | | | | | | | | | | | | fix wrong method nameMorris Jobke2016-10-201-1/+1
| * | | | | | | | | | | | | | Changed request to not add a prefix to the url (#26256)Sergio Bertolín2016-10-204-3/+33
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1885 from nextcloud/downstream-26295Morris Jobke2016-10-243-37/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | App dependencies are now analysed on app enable as well - not only on app ins...Thomas Müller2016-10-243-37/+61
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1886 from nextcloud/downstream-26385Roeland Jago Douma2016-10-243-30/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove checks whether OC is running on Windows pt. 2RealRancor2016-10-243-30/+4
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1881 from nextcloud/downstream-26354Roeland Jago Douma2016-10-241-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Throw exception because the logger causes session issues anyway that early in...Morris Jobke2016-10-241-1/+1
| * | | | | | | | | | | | | log error when setting timezone to UTC fails (#26354)Jörn Friedrich Dreyer2016-10-241-1/+3
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1879 from nextcloud/fix-missing-importRoeland Jago Douma2016-10-241-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Import the used classesJoas Schilling2016-10-241-0/+3
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1892 from nextcloud/refactor-readmeMorris Jobke2016-10-241-37/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Refactor READMEMarius Blüm2016-10-241-37/+25
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1828 from nextcloud/avatar-picker-improvementsMorris Jobke2016-10-243-15/+57
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | use smaller cropper on small screensRobin Appelman2016-10-241-2/+2
| * | | | | | | | | | | center cropper verticallyRobin Appelman2016-10-241-9/+7
| * | | | | | | | | | | set initial cropper to max sizeRobin Appelman2016-10-211-4/+6
| * | | | | | | | | | | show spinner while loading/cropping avatarRobin Appelman2016-10-201-2/+10
| * | | | | | | | | | | only show cropper dialog when the cropper is readyRobin Appelman2016-10-201-1/+2
| * | | | | | | | | | | float the avatar cropper over the pageRobin Appelman2016-10-203-8/+38
| * | | | | | | | | | | Prevent flashing the full sized image when cropping an avatarRobin Appelman2016-10-201-2/+5
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #1873 from nextcloud/files_sharing_singularRoeland Jago Douma2016-10-247-29/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix testsRoeland Jago Douma2016-10-241-19/+19
| * | | | | | | | | | | Move files_sharing Controllers => ControllerRoeland Jago Douma2016-10-246-10/+10
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #1830 from nextcloud/downstream-26250Lukas Reschke2016-10-242-7/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove sensible information from exception messageMorris Jobke2016-10-241-6/+6
| * | | | | | | | | | Add message to NotSquareException thrown from AvatarOlivier Mehani2016-10-242-7/+7
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1872 from nextcloud/ds-26447-misleading-ssl-configMorris Jobke2016-10-241-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix misleading SSL/TLS SMTP email configurationJoas Schilling2016-10-241-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1866 from xcellardoor/masterMorris Jobke2016-10-241-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Modified the SQLite warning of server/settings/templates/admin/tiptricks.php ...Sam Cater2016-10-241-2/+2
* | | | | | | | | | Merge pull request #1853 from nextcloud/fix_di_share_apiMorris Jobke2016-10-246-132/+126
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix middleware testsRoeland Jago Douma2016-10-241-13/+17
| * | | | | | | | | Move Share20OCS to ShareAPIControllerRoeland Jago Douma2016-10-245-119/+109
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1820 from nextcloud/4byte-filenamesRoeland Jago Douma2016-10-245-5/+43
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Added method to DB and fix testRoeland Jago Douma2016-10-242-2/+19
| * | | | | | | | Allow 4byte unicode filenames on supported platformsRobin Appelman2016-10-203-3/+24
* | | | | | | | | Merge pull request #1849 from nextcloud/oc_26368Lukas Reschke2016-10-223-0/+82
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add unit testLukas Reschke2016-10-221-0/+40
| * | | | | | | | | Adding capability about new chunking - refs #25682 (#26368)Thomas Müller2016-10-212-0/+42
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1832 from nextcloud/select2-into-coreLukas Reschke2016-10-225-16/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Template css orderJohn Molakvoæ2016-10-215-16/+6
| | |_|/ / / / / / | |/| | | | | | |