Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #12577 from owncloud/public-mount-api | Lukas Reschke | 2014-12-08 | 15 | -43/+268 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Add public api for mount configurations | Robin Appelman | 2014-12-04 | 15 | -43/+268 | |
* | | | | | Merge pull request #12618 from owncloud/initial-work-migrate-to-appframework | Lukas Reschke | 2014-12-08 | 7 | -39/+62 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add REST route for user & group management | Lukas Reschke | 2014-12-08 | 7 | -39/+62 | |
* | | | | | | Merge pull request #12452 from owncloud/server2server-ng-ocs | Morris Jobke | 2014-12-08 | 2 | -5/+7 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | OCS API for server-to-server sharing | Bjoern Schiessle | 2014-12-04 | 2 | -5/+7 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-08 | 4 | -0/+8 | |
* | | | | | | Remove changes which were inadvertently pushed to master | Olivier Paroz | 2014-12-08 | 1 | -78/+0 | |
* | | | | | | Dump Arrays, Objects and Exceptions to the log | Olivier Paroz | 2014-12-08 | 1 | -0/+78 | |
* | | | | | | Merge pull request #12644 from owncloud/add-hack-for-config | Lukas Reschke | 2014-12-07 | 1 | -1/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Create config if it does not exists | Lukas Reschke | 2014-12-06 | 1 | -1/+9 | |
| | |_|/ / / | |/| | | | | ||||||
* / | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-07 | 8 | -0/+16 | |
|/ / / / / | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-06 | 66 | -250/+28 | |
* | | | | | Remove checks for safe mode and magic quotes | Lukas Reschke | 2014-12-05 | 3 | -25/+1 | |
* | | | | | Merge pull request #12561 from oparoz/vectoricon | Morris Jobke | 2014-12-05 | 1 | -1/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Improve the bitmap and vector mime icons | Olivier Paroz | 2014-12-02 | 1 | -1/+4 | |
* | | | | | | Merge pull request #12583 from owncloud/trim-port | Morris Jobke | 2014-12-05 | 2 | -10/+25 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add workaround for older instances | Lukas Reschke | 2014-12-03 | 1 | -3/+8 | |
| * | | | | | | Trim port from domain | Lukas Reschke | 2014-12-03 | 2 | -8/+18 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-05 | 70 | -70/+80 | |
* | | | | | | Merge pull request #12619 from owncloud/use-also-original-hea | Morris Jobke | 2014-12-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Merge headers | Lukas Reschke | 2014-12-04 | 1 | -1/+1 | |
* | | | | | | Merge pull request #12616 from owncloud/node-fileinfo | Morris Jobke | 2014-12-04 | 3 | -28/+60 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | make \OC\Files\Node\Node implement the FileInfo interface | Robin Appelman | 2014-12-04 | 3 | -28/+60 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #12607 from owncloud/this-is-an-awesome-day | Clark Tomlinson | 2014-12-04 | 1 | -11/+2 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | PHP 5.4 is now required for master | Lukas Reschke | 2014-12-04 | 1 | -11/+2 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #12609 from owncloud/remove-53-fixme | Thomas Müller | 2014-12-04 | 1 | -18/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove workaround for 5.3 | Lukas Reschke | 2014-12-04 | 1 | -18/+2 | |
| |/ / / / | ||||||
* | | | | | no nested xml tags on dependencies | Thomas Müller | 2014-12-04 | 1 | -2/+2 | |
* | | | | | fix an issue where the types tag holds an empty string | Thomas Müller | 2014-12-04 | 1 | -4/+8 | |
* | | | | | adjust dependency analyzer to use attributes properly | Thomas Müller | 2014-12-04 | 1 | -14/+27 | |
* | | | | | switch to different parsing implementation to get xml attributes properly han... | Thomas Müller | 2014-12-04 | 1 | -1/+56 | |
* | | | | | adding supported databases | Thomas Müller | 2014-12-04 | 2 | -0/+32 | |
* | | | | | introduce dependency analyzer to take care of app dependencies | Thomas Müller | 2014-12-04 | 3 | -2/+79 | |
* | | | | | adding default key value pair for 'types' | Thomas Müller | 2014-12-04 | 1 | -0/+3 | |
* | | | | | translate labels properly | Thomas Müller | 2014-12-04 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #12572 from owncloud/issue/12571-disabled-preview-logflood | Lukas Reschke | 2014-12-03 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Stop flooding the log, when previews are disabled | Joas Schilling | 2014-12-03 | 1 | -1/+1 | |
* | | | | | Merge pull request #12553 from owncloud/default-iosid | Thomas Müller | 2014-12-03 | 1 | -0/+8 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | add missing public interface for iOS client app id | Morris Jobke | 2014-12-02 | 1 | -0/+8 | |
| |/ / / | ||||||
* | | | | Merge pull request #10881 from owncloud/touch-statcache | Robin Appelman | 2014-12-02 | 2 | -0/+2 | |
|\ \ \ \ | ||||||
| * | | | | also clear statcache in mapped local | Robin Appelman | 2014-12-02 | 1 | -0/+1 | |
| * | | | | Clear statcache before getting the mtime from local storage backends | Robin Appelman | 2014-12-02 | 1 | -0/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #11975 from owncloud/Combustible-combustible_dev | Morris Jobke | 2014-12-02 | 1 | -254/+267 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Use \OCP\ILogger | Thomas Müller | 2014-12-01 | 1 | -257/+264 | |
| * | | | Added error check to lib/private/image.php | Byron Marohn | 2014-12-01 | 1 | -0/+6 | |
* | | | | Merge pull request #12310 from kampka/master | Thomas Müller | 2014-12-02 | 1 | -0/+48 | |
|\ \ \ \ | ||||||
| * | | | | Implement a logger to log to error_log | Christian Kampka | 2014-12-01 | 1 | -0/+48 | |
* | | | | | Merge pull request #12419 from owncloud/read-only-config | Thomas Müller | 2014-12-01 | 2 | -3/+11 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Allow read-only configuration | Lukas Reschke | 2014-11-25 | 2 | -3/+11 |