aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix type hints and doc blocksJoas Schilling2017-03-232-8/+8
* Ensure that FileInfo return values as required by its phpdoc.Piotr M2017-03-221-6/+8
* [tx-robot] updated from transifexNextcloud bot2017-03-2262-20/+348
* Merge pull request #3497 from nextcloud/mount-shared-lastMorris Jobke2017-03-224-4/+52
|\
| * add integration test to ensure that shares dont overwrite external storagesRobin Appelman2017-03-222-2/+18
| * mount shared mounts lastRobin Appelman2017-03-222-2/+34
* | Merge pull request #3990 from nextcloud/remove-owncloud-root-cert-as-per-todoRoeland Jago Douma2017-03-221-66/+0
|\ \
| * | Remove the cert as wellJoas Schilling2017-03-221-66/+0
* | | Merge pull request #3992 from nextcloud/revert-3795-bundle_vendor_jsMorris Jobke2017-03-227-42634/+16
|\ \ \
| * | | Revert "Bundle vendor js"Roeland Jago Douma2017-03-227-42634/+16
|/ / /
* | | Merge pull request #3977 from nextcloud/di_ng2blizzz2017-03-227-19/+65
|\ \ \
| * | | Register the namespace with the autoloading to allow reverse recoveryJoas Schilling2017-03-222-7/+26
| * | | Also cache the namespace from appinfoJoas Schilling2017-03-221-3/+4
| * | | Add the AppContainerRoeland Jago Douma2017-03-221-0/+8
| * | | Don't do a recursive searchJoas Schilling2017-03-224-3/+24
| * | | buildAppNamespace already has the fallbackJoas Schilling2017-03-221-11/+1
| * | | Make DI work for all appsRoeland Jago Douma2017-03-211-6/+13
* | | | Merge pull request #3795 from nextcloud/bundle_vendor_jsRoeland Jago Douma2017-03-227-16/+42634
|\ \ \ \ | |_|_|/ |/| | |
| * | | Handlebars is already loaded by core.jsRoeland Jago Douma2017-03-221-2/+0
| * | | When debug don't load the bundled fileRoeland Jago Douma2017-03-221-2/+19
| * | | No need to exitRoeland Jago Douma2017-03-221-1/+0
| * | | Bump core.jsRoeland Jago Douma2017-03-221-1/+2
| * | | Add CI step to verify merged vendor jsRoeland Jago Douma2017-03-222-0/+34
| * | | Bundle more default vendor jsRoeland Jago Douma2017-03-223-5/+4236
| * | | Merge vendor jsRoeland Jago Douma2017-03-223-14/+38352
| |/ /
* | | Merge pull request #3983 from nextcloud/remove-owncloud-root-cert-as-per-todoRoeland Jago Douma2017-03-221-8/+1
|\ \ \ | | |/ | |/|
| * | Remove ownCloud Root Authority as per todoJoas Schilling2017-03-221-8/+1
* | | Merge pull request #3982 from nextcloud/hide-systemtag-delete-tooltipRoeland Jago Douma2017-03-221-0/+1
|\ \ \ | |/ / |/| |
| * | Remove tooltip of delete button for systemtagsMorris Jobke2017-03-211-0/+1
* | | 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
* | | | Merge pull request #3980 from nextcloud/fix-app-menu-triangleChristoph Wurst2017-03-221-1/+1
|\ \ \ \
| * | | | Fix position of triangle in app menuMorris Jobke2017-03-211-1/+1
| | |_|/ | |/| |
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-2262-52/+272
| |_|/ |/| |
* | | Merge pull request #3974 from nextcloud/fix-reshare-activity-messageMorris Jobke2017-03-211-1/+1
|\ \ \ | |/ / |/| |
| * | 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
* | | Merge pull request #3975 from nextcloud/remove-dead-codeMorris Jobke2017-03-211-1/+0
|\ \ \
| * | | Remove test codeLukas Reschke2017-03-211-1/+0
|/ / /
* | | Merge pull request #3844 from nextcloud/unshare_eventJoas Schilling2017-03-216-209/+298
|\ \ \
| * | | Update autoloaderRoeland Jago Douma2017-03-172-0/+2
| * | | Add LegacyHooksRoeland Jago Douma2017-03-174-210/+292
| * | | Add unshare eventRoeland Jago Douma2017-03-171-0/+5
* | | | Merge pull request #3968 from nextcloud/fix-brandingLukas Reschke2017-03-211-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | [master] Fix brandingLukas Reschke2017-03-211-1/+1
|/ / /
* | | Merge pull request #3955 from nextcloud/downstream-27113Roeland Jago Douma2017-03-215-5/+17
|\ \ \
| * | | [CI] Can we get some faster phpunit execution? (#27113)Thomas Müller2017-03-205-5/+17
* | | | Merge pull request #3901 from nextcloud/di_ngLukas Reschke2017-03-215-288/+376
|\ \ \ \