summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Resolves warnings in Chrome Dev Console:Guillaume Boudreau2018-04-292-4/+7
* [tx-robot] updated from transifexNextcloud bot2018-04-2916-0/+32
* [tx-robot] updated from transifexNextcloud bot2018-04-2820-14/+16
* Merge pull request #9309 from nextcloud/feature/noid/no_js_sharepermission_logicMorris Jobke2018-04-274-19/+26
|\
| * Fix sharedfilelistSpec.js testsRoeland Jago Douma2018-04-261-3/+6
| * Do not add sharePermission logic in JSRoeland Jago Douma2018-04-263-16/+20
* | Merge pull request #9325 from GitHubUser4234/ldap_cloned_connection_nc13fixMorris Jobke2018-04-271-0/+3
|\ \
| * | unbound cloned connection fixRoger Szabo2018-04-271-0/+3
* | | Merge pull request #9321 from nextcloud/bugfix/noid/return_root_folder_when_a...Morris Jobke2018-04-271-1/+5
|\ \ \
| * | | Actually return the root folder when traversing up the treeRoeland Jago Douma2018-04-261-1/+5
* | | | Merge pull request #9322 from nextcloud/bugfix/noid/swift_token_cacheMorris Jobke2018-04-271-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | generateTokenFromCache is only valid for V3Roeland Jago Douma2018-04-261-2/+2
| * | | json_decode an associative array for the swift cached tokenRoeland Jago Douma2018-04-261-1/+1
| |/ /
* | | Merge pull request #9319 from nextcloud/rakekniven-patch-1Morris Jobke2018-04-271-1/+1
|\ \ \
| * | | Fixed typorakekniven2018-04-261-1/+1
| |/ /
* / / [tx-robot] updated from transifexNextcloud bot2018-04-2756-156/+316
|/ /
* | Merge pull request #9302 from nextcloud/update-phan-configMorris Jobke2018-04-261-7/+43
|\ \ | |/ |/|
| * Improve phan configLukas Reschke2018-04-261-7/+43
* | Merge pull request #9308 from nextcloud/proper-ocp-constantsMorris Jobke2018-04-2674-298/+412
|\ \
| * | move log constants to ILoggerArthur Schiwon2018-04-2674-298/+412
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-04-262-0/+2
* | Merge pull request #9256 from nextcloud/fed-sharing-improvementsMorris Jobke2018-04-256-89/+25
|\ \
| * | improve error reporting and move format parameter to the optionsBjoern Schiessle2018-04-256-89/+25
* | | Merge pull request #9296 from nextcloud/migrate-groups-fetch-to-ocs-apiMorris Jobke2018-04-252-450/+457
|\ \ \
| * | | Workflow engine to ocs apiJohn Molakvoæ (skjnldsv)2018-04-251-369/+373
| * | | Settings groups to ocsJohn Molakvoæ (skjnldsv)2018-04-251-81/+84
* | | | Merge pull request #9284 from nextcloud/bugfix/9279/strict_sharee_apiMorris Jobke2018-04-251-5/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make ShareesAPIController strictRoeland Jago Douma2018-04-231-5/+6
* | | | Merge pull request #8540 from nextcloud/theming-advancedMorris Jobke2018-04-2517-623/+717
|\ \ \ \
| * | | | Add more tests for ImageManagerJulius Härtl2018-04-191-0/+91
| * | | | Fix theming testsJulius Härtl2018-04-197-253/+186
| * | | | Make sure the custom favicon is usedJulius Härtl2018-04-191-2/+10
| * | | | Add typehintsJulius Härtl2018-04-193-3/+4
| * | | | Fix background colorJulius Härtl2018-04-191-5/+9
| * | | | Return valueJulius Härtl2018-04-191-1/+1
| * | | | Remove unneeded preview image handlingJulius Härtl2018-04-191-3/+0
| * | | | Fix undo preview and remove duplicate codeJulius Härtl2018-04-192-29/+28
| * | | | Add advanced theming options to frontendJulius Härtl2018-04-191-7/+37
| * | | | Use generic image upload in theming JSJulius Härtl2018-04-191-45/+17
| * | | | Use SCSS for previewing images as wellJulius Härtl2018-04-191-6/+39
| * | | | Move theming settings to SCSSJulius Härtl2018-04-192-107/+120
| * | | | Move to more generic image handling and add extra imagesJulius Härtl2018-04-197-178/+191
* | | | | [tx-robot] updated from transifexNextcloud bot2018-04-254-2/+4
* | | | | Merge pull request #9248 from nextcloud/fix-files-ellipsisRoeland Jago Douma2018-04-242-84/+27
|\ \ \ \ \
| * | | | | Add min-width to trick the table width calculation in safariJulius Härtl2018-04-221-11/+14
| * | | | | Use flex based layout inside the filename table cellJulius Härtl2018-04-192-84/+24
| |/ / / /
* | | | | Merge pull request #9292 from nextcloud/bugfix/9279/cast_db_backend_numericRoeland Jago Douma2018-04-241-5/+8
|\ \ \ \ \
| * | | | | Numeric only uids are no funRoeland Jago Douma2018-04-241-1/+4
| * | | | | Cast retrieved DB fields to stringRoeland Jago Douma2018-04-241-4/+4
* | | | | | Merge pull request #9282 from nextcloud/bugfix/9279/scrit_type_share_apiJoas Schilling2018-04-242-54/+55
|\ \ \ \ \ \ | |/ / / / / |/| | | | |