Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15123 from owncloud/fix_14098 | blizzz | 2015-03-23 | 2 | -1/+15 |
|\ | |||||
| * | offset needs to be considered in computed limit | Arthur Schiwon | 2015-03-23 | 2 | -1/+15 |
* | | Merge pull request #13941 from owncloud/fix-folder-upload-on-firefox | Lukas Reschke | 2015-03-23 | 1 | -0/+9 |
|\ \ | |||||
| * | | Show message if upload of folder isn't allowed | Morris Jobke | 2015-02-06 | 1 | -0/+9 |
* | | | Merge pull request #15120 from owncloud/ldap-occ-fix-warnings | Morris Jobke | 2015-03-23 | 4 | -10/+37 |
|\ \ \ | |_|/ |/| | | |||||
| * | | fix PHP warnings when using occ with some LDAP commands | Arthur Schiwon | 2015-03-23 | 4 | -10/+37 |
* | | | Merge pull request #14383 from jknockaert/newbranch | Clark Tomlinson | 2015-03-23 | 1 | -130/+160 |
|\ \ \ | |/ / |/| | | |||||
| * | | again | jknockaert | 2015-02-19 | 1 | -36/+0 |
| * | | try again | jknockaert | 2015-02-19 | 1 | -0/+36 |
| |\ \ | |||||
| | * \ | Merge remote-tracking branch 'origin/master' | jknockaert | 2015-02-19 | 5 | -4/+21 |
| | |\ \ | |||||
| | | * | | OC8 version | jknockaert | 2015-02-19 | 1 | -196/+170 |
| | | * | | update enc stream | jknockaert | 2014-12-17 | 1 | -136/+161 |
| | * | | | back | jknockaert | 2015-02-19 | 1 | -35/+34 |
| * | | | | new try | jknockaert | 2015-02-19 | 1 | -130/+160 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-23 | 8 | -2/+18 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-22 | 22 | -0/+52 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-21 | 4 | -0/+4 |
* | | | | | Merge pull request #14857 from owncloud/preview-provider-registration-in-manager | Thomas Müller | 2015-03-20 | 3 | -4/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Fix controller test | Joas Schilling | 2015-03-16 | 1 | -0/+1 |
| * | | | | | Move mimetype check from template to controller | Joas Schilling | 2015-03-16 | 2 | -4/+4 |
| * | | | | | Use the PreviewManager where possible | Joas Schilling | 2015-03-16 | 1 | -2/+2 |
* | | | | | | Merge pull request #11884 from owncloud/ext-appframework | Vincent Petry | 2015-03-20 | 30 | -488/+4309 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Introduce async status checking | Robin McCorkell | 2015-03-20 | 3 | -10/+9 |
| * | | | | | | Fix PHPDoc in files_external, add missing tag | Vincent Petry | 2015-03-17 | 8 | -25/+77 |
| * | | | | | | Fix storage priority in JS unit test | Vincent Petry | 2015-03-16 | 1 | -3/+6 |
| * | | | | | | Fix PHPDoc for StoragesController | Vincent Petry | 2015-03-16 | 1 | -6/+9 |
| * | | | | | | Generate storage config ids when missing | Vincent Petry | 2015-03-16 | 8 | -43/+317 |
| * | | | | | | Fix mount config unit tests | Vincent Petry | 2015-03-13 | 2 | -26/+56 |
| * | | | | | | Mount options for ext storage are now passed around | Vincent Petry | 2015-03-13 | 13 | -6/+109 |
| * | | | | | | Implement priority on client side in hidden input | Robin McCorkell | 2015-03-12 | 2 | -0/+15 |
| * | | | | | | Use storage id + appframework for ext storage CRUD | Vincent Petry | 2015-03-12 | 27 | -454/+3796 |
* | | | | | | | Do not automatically add "update" permission to shared mounts | Vincent Petry | 2015-03-20 | 1 | -2/+1 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-20 | 16 | -48/+58 |
* | | | | | | | Merge pull request #14946 from owncloud/dropbox-root-fix | Thomas Müller | 2015-03-19 | 1 | -1/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix root request path for Dropbox | Vincent Petry | 2015-03-17 | 1 | -1/+6 |
* | | | | | | | | Merge pull request #15025 from rullzer/ocs_respect_enforced_date | Thomas Müller | 2015-03-19 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Added unit test | Roeland Jago Douma | 2015-03-19 | 1 | -0/+18 |
* | | | | | | | | | Merge pull request #14537 from owncloud/oci-external-share | Robin Appelman | 2015-03-19 | 3 | -2/+144 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Do not make setupMounts() public just because of testing | Joas Schilling | 2015-03-11 | 2 | -12/+12 |
| * | | | | | | | | Add unit tests for external share mananger | Robin Appelman | 2015-03-10 | 2 | -2/+144 |
| * | | | | | | | | Fix external shares without password on oracle | Robin Appelman | 2015-02-27 | 1 | -1/+1 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-19 | 18 | -8/+24 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-18 | 30 | -16/+72 |
* | | | | | | | | | Merge pull request #14954 from owncloud/cache-image-path | Robin McCorkell | 2015-03-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Cache \OC\URLGenerator::imagePath | Lukas Reschke | 2015-03-17 | 1 | -1/+1 |
* | | | | | | | | | | add whitespace to prevent file deletion when wanting to scroll | Jan-Christoph Borchardt | 2015-03-17 | 1 | -1/+1 |
* | | | | | | | | | | Use a closure for the files app entry and deprecate old methods | Joas Schilling | 2015-03-17 | 1 | -17/+22 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Fix PHPDoc and Co. | Lukas Reschke | 2015-03-17 | 1 | -4/+12 |
* | | | | | | | | | Merge pull request #14929 from owncloud/s2s-scanner-warnings | Vincent Petry | 2015-03-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix scanFile signature warnings | Vincent Petry | 2015-03-16 | 1 | -1/+1 |
| | |_|_|/ / / / / | |/| | | | | | | |