summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3995 from nextcloud/files_scan_appdataLukas Reschke2017-03-232-1/+286
|\
| * Use proper name and code styleMorris Jobke2017-03-221-2/+2
| * Add files:scanAppData commandRoeland Jago Douma2017-03-222-1/+286
* | Merge pull request #3948 from nextcloud/downstream-27271Lukas Reschke2017-03-231-3/+8
|\ \
| * | fix path for files from root folderMorris Jobke2017-03-221-1/+5
| * | In the real world id is an initial filenameVictor Dubiniuk2017-03-201-3/+4
* | | Merge pull request #3989 from nextcloud/files-external-save-buttonLukas Reschke2017-03-233-18/+17
|\ \ \
| * | | replace autosave with a save button for external storage configurationRobin Appelman2017-03-223-18/+17
* | | | Merge pull request #3999 from nextcloud/backport-27262Morris Jobke2017-03-232-2/+2
|\ \ \ \
| * | | | Updated UI messages relating to the encryption functionalityMatthew Setter2017-03-222-2/+2
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-238-2/+32
|/ / / /
* | | / [tx-robot] updated from transifexNextcloud bot2017-03-2240-14/+280
| |_|/ |/| |
* | | Revert "Bundle vendor js"Roeland Jago Douma2017-03-221-0/+2
* | | Merge pull request #3795 from nextcloud/bundle_vendor_jsRoeland Jago Douma2017-03-221-2/+0
|\ \ \ | |/ / |/| |
| * | Handlebars is already loaded by core.jsRoeland Jago Douma2017-03-221-2/+0
* | | Merge pull request #3972 from nextcloud/merge-some-more-cssRoeland Jago Douma2017-03-2215-13/+13
|\ \ \
| * | | fix pathMorris Jobke2017-03-212-1/+1
| * | | Merge some CSS files using our SCSS compilerLukas Reschke2017-03-2115-13/+13
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-2238-50/+224
* | | | Fix reshare with user activity messageJoas Schilling2017-03-211-1/+1
| |/ / |/| |
* | | Merge pull request #3937 from nextcloud/downstream-27234Morris Jobke2017-03-211-1/+1
|\ \ \
| * | | fix typo in sftp public keyMartin2017-03-191-1/+1
| | |/ | |/|
* | | [master] Fix brandingLukas Reschke2017-03-211-1/+1
| |/ |/|
* | Merge pull request #3955 from nextcloud/downstream-27113Roeland Jago Douma2017-03-213-1/+7
|\ \
| * | [CI] Can we get some faster phpunit execution? (#27113)Thomas Müller2017-03-203-1/+7
| |/
* | [tx-robot] updated from transifexNextcloud bot2017-03-2122-6/+90
* | Log access to preview imagesLukas Reschke2017-03-203-13/+56
* | Merge pull request #3957 from nextcloud/downstream-27307Christoph Wurst2017-03-201-1/+8
|\ \
| * | Fix provisioning API callJoas Schilling2017-03-201-1/+8
* | | Merge pull request #3884 from nextcloud/downstream-26956Joas Schilling2017-03-204-4/+45
|\ \ \
| * | | Use DIJoas Schilling2017-03-171-1/+1
| * | | Skip null groups in group manager (#26871) (#26956)Vincent Petry2017-03-174-4/+45
* | | | Merge pull request #3868 from nextcloud/issue-3834-escape-theming-footerJoas Schilling2017-03-202-5/+6
|\ \ \ \
| * | | | Don't use private apiJoas Schilling2017-03-201-1/+2
| * | | | Correctly escape the footer description from themingJoas Schilling2017-03-172-5/+5
* | | | | Merge pull request #3950 from nextcloud/downstream-27149Lukas Reschke2017-03-202-1/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix grammarLukas Reschke2017-03-201-1/+1
| * | | | Add ignore_files to config,Felix Heidecke2017-03-202-1/+6
| | |_|/ | |/| |
* | | | Merge pull request #3946 from nextcloud/downstream-27263Roeland Jago Douma2017-03-201-0/+4
|\ \ \ \
| * | | | Fix public link download buttonVincent Petry2017-03-201-0/+4
| |/ / /
* / / / Log files:scan exception, add InterruptedExceptionVincent Petry2017-03-201-8/+10
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-03-2016-46/+336
* | | Merge pull request #3906 from nextcloud/shares-circles-2Roeland Jago Douma2017-03-197-9/+117
|\ \ \
| * | | shares-circlesMaxence Lange2017-03-177-9/+117
* | | | Merge pull request #3913 from cwickert/masterRoeland Jago Douma2017-03-191-1/+1
|\ \ \ \
| * | | | DummyGetResponsePlugin: ownCloud -> NexcloudChristoph Wickert2017-03-181-1/+1
| |/ / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-198-0/+348
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-1810-0/+182
|/ / /
* | | Merge pull request #3887 from nextcloud/downstream-26379Morris Jobke2017-03-173-0/+377
|\ \ \
| * | | Safer queriesJoas Schilling2017-03-171-2/+2