Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Employ config option for OpenSSL config file, if provided. | Owen Winkler | 2013-09-02 | 3 | -7/+21 | |
| * | | | | | | | | Start a branch for easier OpenSSL configuration. | Owen Winkler | 2013-09-02 | 3 | -1/+17 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #4673 from owncloud/ocsapi_cleanup | Jörn Friedrich Dreyer | 2013-09-02 | 2 | -36/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | remove the activity call here. it is not implemented anyways. This will be pr... | Frank Karlitschek | 2013-08-31 | 2 | -36/+0 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #4663 from owncloud/fix-sticky-apps | Morris Jobke | 2013-09-02 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fix issues caused by introduction of sticky Apps management footer | Jan-Christoph Borchardt | 2013-08-30 | 1 | -4/+4 | |
* | | | | | | | | | Merge pull request #4657 from owncloud/files-controls-fixes | Morris Jobke | 2013-09-01 | 1 | -7/+13 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | adjust right padding of controls bar, fix #4650 | Jan-Christoph Borchardt | 2013-08-30 | 1 | -2/+2 | |
| * | | | | | | | | | fix coding style for controls bar | Jan-Christoph Borchardt | 2013-08-30 | 1 | -7/+13 | |
* | | | | | | | | | | Merge pull request #4674 from owncloud/fit-filepicker-new-icons | Morris Jobke | 2013-09-01 | 2 | -2/+19 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | IE8 fixes | Morris Jobke | 2013-09-02 | 1 | -0/+4 | |
| * | | | | | | | | | Fit filesummary for \OC\Preview's ne mimetype-icons | kondou | 2013-08-31 | 1 | -2/+15 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4671 from owncloud/emptycontent | Bernhard Posselt | 2013-09-01 | 5 | -11/+12 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | rename emptyfolder to emptycontent | Alessandro Cosentino | 2013-08-31 | 3 | -8/+8 | |
| * | | | | | | | | text centered horizontally and vertically in emptycontent div | Alessandro Cosentino | 2013-08-31 | 3 | -8/+9 | |
| |/ / / / / / / | ||||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-01 | 228 | -1751/+1919 | |
* | | | | | | | | Merge pull request #4329 from owncloud/fix_4258 | Christopher | 2013-09-01 | 2 | -145/+192 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Check for $this->fileInfo and @depend on testData() | kondou | 2013-09-01 | 2 | -2/+5 | |
| * | | | | | | | | Merge branch 'master' into fix_4258 | kondou | 2013-08-31 | 145 | -120/+4872 | |
| |\| | | | | | | | ||||||
| * | | | | | | | | Fix #4258, clean up \OC_Image and improve its unittest | kondou | 2013-08-30 | 2 | -145/+189 | |
* | | | | | | | | | fixing this obvious typo directly | Frank Karlitschek | 2013-09-01 | 1 | -1/+1 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #4022 from owncloud/oc_preview | Thomas Müller | 2013-08-31 | 145 | -120/+4872 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | fix issue with filetable background | Georg Ehrke | 2013-08-30 | 1 | -1/+1 | |
| * | | | | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-30 | 320 | -5280/+7824 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #4661 from owncloud/separate-app-styles | Jan-Christoph Borchardt | 2013-08-30 | 4 | -284/+285 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | move CSS for browser-specific fixes out of styles.css into new fixes.css | Jan-Christoph Borchardt | 2013-08-30 | 3 | -44/+47 | |
| * | | | | | | | | move CSS for apps out of styles.css into new apps.css | Jan-Christoph Borchardt | 2013-08-30 | 3 | -240/+238 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-30 | 308 | -4962/+7462 | |
* | | | | | | | | | Merge pull request #4578 from houbaastef/master | Stephane Martin | 2013-08-30 | 1 | -5/+10 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | fixes #4574 | Stephane Martin | 2013-08-26 | 1 | -5/+10 | |
* | | | | | | | | | Merge pull request #4660 from owncloud/apps-management-sticky | Morris Jobke | 2013-08-30 | 2 | -2/+25 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Apps management as sticky footer and rename to 'Apps', fix #4622 | Jan-Christoph Borchardt | 2013-08-30 | 2 | -2/+25 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Use Group methods for searching, fixes #4201 | Arthur Schiwon | 2013-08-30 | 1 | -6/+5 | |
* | | | | | | | | | prefix 'tbody tr' to separate app/core css errors | petemcfarlane | 2013-08-30 | 1 | -1/+1 | |
* | | | | | | | | | Use the real username in preferences and magic cookie instead of case-insensi... | Arthur Schiwon | 2013-08-30 | 1 | -3/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #4642 from masakik/master | Morris Jobke | 2013-08-29 | 2 | -9/+28 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | replace ident spaces with tabs | Masaki | 2013-08-29 | 2 | -22/+23 | |
| * | | | | | | | | enable usage with CLI interface | Masaki Kawabata Neto | 2013-08-29 | 1 | -2/+5 | |
| * | | | | | | | | added help and status commands | Masaki Kawabata Neto | 2013-08-29 | 0 | -0/+0 | |
| * | | | | | | | | added help and status commands | Masaki Kawabata Neto | 2013-08-29 | 1 | -7/+22 | |
* | | | | | | | | | Merge pull request #4592 from owncloud/fix-logic | Thomas Müller | 2013-08-29 | 1 | -4/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fix weird logical behaviour | Morris Jobke | 2013-08-27 | 1 | -4/+2 | |
* | | | | | | | | | | Merge pull request #4643 from owncloud/touch-newfile-hook | Thomas Müller | 2013-08-29 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | also emmit create hook when creating new files using touch() | Robin Appelman | 2013-08-29 | 1 | -0/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | webdav quota information contains the values for used and free - not total | Thomas Müller | 2013-08-29 | 1 | -1/+1 | |
| | | * | | | | | | use gerMimeTypeDetector detectPath instead of getMimeType | Georg Ehrke | 2013-08-30 | 1 | -1/+1 | |
| | | * | | | | | | fix parameter missing warning | Georg Ehrke | 2013-08-29 | 1 | -1/+1 | |
| | | * | | | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 368 | -5791/+6409 | |
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4552 from dampfklon/fix4552 | Morris Jobke | 2013-08-28 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Make group suffix in share dialog translatable | dampfklon | 2013-08-22 | 1 | -1/+5 |