summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #4038 from nextcloud/merge-js-for-fileviewMorris Jobke2017-03-242-30/+30
|\ \
| * | Merge file view JS filesLukas Reschke2017-03-242-30/+30
| |/
* | Merge pull request #4039 from nextcloud/merge-js-for-commentsMorris Jobke2017-03-242-7/+10
|\ \ | |/ |/|
| * Merge JS for commentsLukas Reschke2017-03-242-7/+10
|/
* Merge pull request #3988 from nextcloud/jscombinerLukas Reschke2017-03-2415-5/+727
|\
| * Update autoloaderRoeland Jago Douma2017-03-242-0/+4
| * TestsRoeland Jago Douma2017-03-245-0/+384
| * Add returnRoeland Jago Douma2017-03-241-1/+1
| * Add debug modeRoeland Jago Douma2017-03-243-2/+41
| * Add cachingRoeland Jago Douma2017-03-242-7/+44
| * Combine additional files_sharing scriptsRoeland Jago Douma2017-03-242-3/+6
| * [PoC] JS CombinerRoeland Jago Douma2017-03-246-2/+257
* | Merge pull request #4021 from nextcloud/update-dependenciesMorris Jobke2017-03-241-0/+0
|\ \
| * | Update dependenciesMorris Jobke2017-03-241-0/+0
* | | Merge pull request #3825 from nextcloud/federation-fixesBjörn Schießle2017-03-246-65/+121
|\ \ \ | |_|/ |/| |
| * | fix testsBjoern Schiessle2017-03-242-8/+28
| * | Load cert file before syncing addressbooks and contactsJoas Schilling2017-03-241-16/+31
| * | use right format for avatarsBjoern Schiessle2017-03-242-5/+5
| * | don't add empty values to the vcardBjoern Schiessle2017-03-243-40/+56
| * | only execute code if exception was thrown by the corresponding controllerBjoern Schiessle2017-03-242-3/+7
| * | fix the way we create a new vcard to avoid to have multiple UIDsBjoern Schiessle2017-03-241-1/+2
|/ /
* | Merge pull request #4010 from nextcloud/fac-58-mimetype-on-creating-directoriesJoas Schilling2017-03-241-0/+6
|\ \
| * | Fix workflow engine mimetype detection when creating a directoryJoas Schilling2017-03-231-0/+6
* | | Merge pull request #4026 from nextcloud/appmenu-fixLukas Reschke2017-03-241-1/+2
|\ \ \
| * | | Fix appmenu issuesJulius Härtl2017-03-241-1/+2
* | | | Merge pull request #4013 from nextcloud/bundle_vendor_jsLukas Reschke2017-03-247-15/+42691
|\ \ \ \
| * | | | Handlebars is already loaded by core.jsRoeland Jago Douma2017-03-231-2/+0
| * | | | Add CI step to verify merged vendor jsRoeland Jago Douma2017-03-232-0/+33
| * | | | Merge vendor jsRoeland Jago Douma2017-03-234-13/+42658
* | | | | Merge pull request #4022 from nextcloud/downstream-27105Roeland Jago Douma2017-03-242-4/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove auto-focus on certain input fieldsFelix Heidecke2017-03-232-4/+8
| | |_|/ | |/| |
* | | | Merge pull request #4025 from nextcloud/downstream-27292Roeland Jago Douma2017-03-244-5960/+14
|\ \ \ \
| * | | | also install sinonMorris Jobke2017-03-231-1/+2
| * | | | Properly clear heartbeat intervalVincent Petry2017-03-231-1/+1
| * | | | Update karma, use sinon from npmVincent Petry2017-03-233-5958/+11
* | | | | Merge pull request #3928 from nextcloud/downstream-17978Morris Jobke2017-03-2313-39/+256
|\ \ \ \ \
| * | | | | Improve error message of charset convert script and behaviourMorris Jobke2017-03-231-4/+5
| * | | | | Fix autoloaderMorris Jobke2017-03-222-0/+4
| * | | | | Address commentsMorris Jobke2017-03-213-22/+2
| * | | | | Adjust tests as wellMorris Jobke2017-03-211-2/+2
| * | | | | Adding tests for 4 byte unicode charactersMorris Jobke2017-03-2110-20/+252
* | | | | | Merge pull request #3889 from nextcloud/downstream-26950Morris Jobke2017-03-232-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fix sorting in the backendMorris Jobke2017-03-234-80/+3
| * | | | | Sharing dialog: Names sorting is case sensitive #25971Ilja Neumann2017-03-172-0/+77
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-24176-430/+452
| |_|/ / / |/| | | |
* | | | | Merge pull request #3879 from nextcloud/downstream-26915Morris Jobke2017-03-238-8/+267
|\ \ \ \ \
| * | | | | Make deleting a group compatible with ocs v2Joas Schilling2017-03-231-1/+1
| * | | | | Use proper bash test syntaxMorris Jobke2017-03-201-1/+1
| * | | | | Fix warningJoas Schilling2017-03-201-1/+0
| * | | | | 200 is okJoas Schilling2017-03-201-15/+15