summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | rename proxy testRobin Appelman2015-03-261-7/+7
* | | | | | | | | Merge pull request #15234 from owncloud/encryption2_coreThomas Müller2015-03-264-0/+172
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | implement basic encryption functionallity in core to enable multiple encrypti...Bjoern Schiessle2015-03-264-0/+172
* | | | | | | | | | Merge pull request #15237 from owncloud/remove-ide-autocomplete-failThomas Müller2015-03-261-1/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove IDE autocomplete failLukas Reschke2015-03-261-1/+0
* | | | | | | | | | | Merge pull request #15214 from owncloud/no-php-timeouts-on-webdav-masterMorris Jobke2015-03-261-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | no php execution timeout for webdavThomas Müller2015-03-261-0/+4
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #15129 from owncloud/version-command-busLukas Reschke2015-03-263-6/+92
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | teardown after we're doneRobin Appelman2015-03-261-0/+1
| * | | | | | | | | save uid instead of user object in commandRobin Appelman2015-03-262-5/+5
| * | | | | | | | | Setup the filesystem in the expire commandRobin Appelman2015-03-263-4/+24
| * | | | | | | | | expire versions in a background commandRobin Appelman2015-03-262-5/+70
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #14958 from owncloud/dropdown-styleJan-Christoph Borchardt2015-03-261-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | adjust animations of Share, Versions and others to OC.menuSpeedJan-Christoph Borchardt2015-03-261-3/+4
* | | | | | | | | | Merge pull request #14495 from owncloud/update-mailmap-01Thomas Müller2015-03-26288-2474/+5364
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update license headersJenkins for ownCloud2015-03-26288-2474/+5364
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Revert "add https:// placeholder for From Link feature. closes #13255"Robin McCorkell2015-03-261-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #15206 from owncloud/mark-dot-files-grayThomas Müller2015-03-262-1/+24
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Show hidden files (dot files) in grayMorris Jobke2015-03-262-1/+24
* | | | | | | | | Merge pull request #15195 from owncloud/reanimate-add-guzzleMorris Jobke2015-03-264-29/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add wrapper for GuzzleLukas Reschke2015-03-254-29/+17
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-268-4/+32
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #15170 from owncloud/middleclickbreadcrumbMorris Jobke2015-03-262-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix breadcrumb click JS unit testVincent Petry2015-03-251-2/+2
| * | | | | | | | Fix middle click on breadcrumbVincent Petry2015-03-241-2/+2
* | | | | | | | | Merge pull request #15185 from owncloud/fix-14775-masterVincent Petry2015-03-251-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | tearDown the file system before reinitializing - fixes #14775Thomas Müller2015-03-251-0/+1
* | | | | | | | | Merge pull request #15180 from owncloud/ext-tabbingMorris Jobke2015-03-251-30/+21
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Use individual timers for separate config rowsRobin McCorkell2015-03-241-30/+21
* | | | | | | | | Merge pull request #15179 from owncloud/trash-recreatetrashfolderafterfulldeleteVincent Petry2015-03-251-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Recreate trashbin folder after full deletionVincent Petry2015-03-241-0/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #14970 from owncloud/sidebar-enhancementsJan-Christoph Borchardt2015-03-251-2/+8
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | double padding to account for Deleted files entry, issue with FirefoxJan-Christoph Borchardt2015-03-241-0/+4
| * | | | | | | | fix position of 'Deleted files' sidebar entry, fix #10815Jan-Christoph Borchardt2015-03-181-2/+4
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2514-2/+22
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #15055 from owncloud/share-activity-groupingMorris Jobke2015-03-241-0/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Group sharing activities by user/group and file respectivelyJoas Schilling2015-03-201-0/+14
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #15160 from owncloud/deduplicate-external-manager-testsMorris Jobke2015-03-242-154/+67
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge the two tests into oneJoas Schilling2015-03-242-154/+67
* | | | | | | | | No longer directly output OC_Image for thumbnailsRoeland Jago Douma2015-03-243-15/+53
* | | | | | | | | Merge pull request #15158 from owncloud/fix-failing-masterRobin Appelman2015-03-242-5/+14
|\| | | | | | | |
| * | | | | | | | *cough*Joas Schilling2015-03-242-5/+14
* | | | | | | | | Merge pull request #14998 from rullzer/ocs_api_new_urlMorris Jobke2015-03-242-2/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Added extra unit testRoeland Jago Douma2015-03-211-0/+5
| * | | | | | | | OCS API should return fancy OC urlRoeland Jago Douma2015-03-211-2/+1
* | | | | | | | | correctly align file list summary when the list has the favorite featureJan-Christoph Borchardt2015-03-241-0/+3
* | | | | | | | | Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-shareMorris Jobke2015-03-244-26/+209
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Add a unit test for the naming conflict on the mountpoint nameJoas Schilling2015-03-172-6/+155
| * | | | | | | | Use insertIfNotExists() instead of manual logicJoas Schilling2015-03-171-24/+31
| * | | | | | | | Correctly get the unique mountpoint name when mounting the shareJoas Schilling2015-03-173-10/+37
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 19:49:14 +0000