Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10143 from owncloud/fix-top-border | Raghu Nayyar | 2014-08-05 | 1 | -0/+4 |
|\ | |||||
| * | no top border for first settings item, detail enhancement | Jan-Christoph Borchardt | 2014-08-04 | 1 | -0/+4 |
* | | Merge pull request #10083 from th3fallen/fix-9969-take-two | Joas Schilling | 2014-08-04 | 2 | -37/+9 |
|\ \ | |||||
| * \ | Merge branch 'fix-9969-take-two' of https://github.com/th3fallen/core into fi... | Clark Tomlinson | 2014-07-31 | 0 | -0/+0 |
| |\ \ | |||||
| | * | | Resolving 9969 resubmitting to fix rebase issue. | Clark Tomlinson | 2014-07-31 | 2 | -37/+9 |
| * | | | Removing unnecessary switch statements in fopen methods. | Clark Tomlinson | 2014-07-31 | 2 | -37/+9 |
| |/ / | |||||
* | | | Merge pull request #10150 from owncloud/fix-9782 | blizzz | 2014-08-04 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | Set group usercount to 0, not '', fixes #9782 | tomneedham | 2014-08-04 | 1 | -1/+3 |
* | | | | Merge pull request #10138 from owncloud/innodb-repair-non-oc | Thomas Müller | 2014-08-04 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Dont touch non-oc tables when doing the InnoDB repair step | Robin Appelman | 2014-08-04 | 1 | -1/+1 |
* | | | | Merge pull request #10025 from owncloud/l10n-typo | Thomas Müller | 2014-08-04 | 1 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | expire -> expiration | Volkan Gezer | 2014-08-02 | 1 | -6/+6 |
| * | | | | suggestions by deepdiver | Volkan Gezer | 2014-08-01 | 1 | -4/+4 |
| * | | | | typo fix from transifex suggestion | Volkan Gezer | 2014-07-30 | 1 | -2/+2 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-04 | 18 | -34/+35 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-03 | 12 | -12/+12 |
| |_|_|/ |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-02 | 34 | -169/+214 |
* | | | | Merge pull request #10097 from owncloud/background-fix | Jan-Christoph Borchardt | 2014-08-01 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | add white as background-color | Morris Jobke | 2014-08-01 | 1 | -0/+1 |
| * | | | Remove old color of body | Morris Jobke | 2014-08-01 | 1 | -1/+0 |
* | | | | Merge pull request #10098 from owncloud/fix-10094-master | Thomas Müller | 2014-08-01 | 1 | -8/+10 |
|\ \ \ \ | |||||
| * | | | | fix return documentation | Jörn Friedrich Dreyer | 2014-08-01 | 1 | -7/+5 |
| * | | | | prevent PHP errors and enhance logging | Thomas Müller | 2014-08-01 | 1 | -1/+5 |
* | | | | | Merge pull request #9529 from helmutschneider/fix-8326 | Robin Appelman | 2014-08-01 | 1 | -17/+12 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Converted an array to PHP5.3 compatible version | Johan Björk | 2014-07-09 | 1 | -2/+2 |
| * | | | | Fixes #8326: deletion of directories on S3 | Johan Björk | 2014-07-08 | 1 | -17/+12 |
* | | | | | Merge pull request #10067 from owncloud/fix-#9119 | Morris Jobke | 2014-08-01 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Quick fix for #9119. Increase preview to keep empty message more centered and... | Remco Brenninkmeijer | 2014-07-30 | 1 | -1/+1 |
* | | | | | | Merge pull request #10085 from owncloud/fixes-for-filepicker | Morris Jobke | 2014-08-01 | 3 | -3/+17 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | also fix filepicker for smaller screen sizes | Jan-Christoph Borchardt | 2014-07-31 | 2 | -1/+10 |
| * | | | | | fix date display in filepicker | Jan-Christoph Borchardt | 2014-07-31 | 1 | -2/+3 |
| * | | | | | fix long filename display in filepicker | Jan-Christoph Borchardt | 2014-07-31 | 1 | -0/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-01 | 17 | -50/+54 |
* | | | | | Merge pull request #10048 from owncloud/fix_search_in_shared_files | Jörn Friedrich Dreyer | 2014-07-31 | 2 | -62/+101 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | add test for search() in shared cache | Jörn Friedrich Dreyer | 2014-07-31 | 1 | -3/+75 |
| * | | | | traverse folders in php to search in shared files | Jörn Friedrich Dreyer | 2014-07-31 | 1 | -59/+26 |
* | | | | | Merge pull request #10051 from owncloud/preview-empty-text | Thomas Müller | 2014-07-31 | 7 | -7/+75 |
|\ \ \ \ \ | |||||
| * | | | | | Use svg mimeicons for empty text files | Robin Appelman | 2014-07-30 | 7 | -7/+75 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-31 | 172 | -1233/+1330 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #10055 from owncloud/notification-fix | Sander | 2014-07-30 | 2 | -5/+19 |
|\ \ \ \ \ | |||||
| * | | | | | set max width for notifications so they won't overlap the whole header | Jan-Christoph Borchardt | 2014-07-30 | 1 | -0/+1 |
| * | | | | | fix yellow notification style | Jan-Christoph Borchardt | 2014-07-30 | 2 | -5/+12 |
| * | | | | | fix notification preventing top bar clickability, fix #9680 | Jan-Christoph Borchardt | 2014-07-30 | 1 | -1/+7 |
* | | | | | | Merge pull request #10054 from owncloud/dont_preload_videos | Jan-Christoph Borchardt | 2014-07-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | don't preload videos on public sharing, fixes #10042 | Georg Ehrke | 2014-07-30 | 1 | -1/+1 |
* | | | | | | | Merge pull request #10044 from owncloud/transparency_fix | Jan-Christoph Borchardt | 2014-07-30 | 1 | -0/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | extract transparency fix from #8050 | Georg Ehrke | 2014-07-30 | 1 | -0/+8 |
* | | | | | | | | Merge pull request #10029 from owncloud/fix-thirdparty | Morris Jobke | 2014-07-30 | 1 | -11/+16 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Replace exit with return | Victor Dubiniuk | 2014-07-30 | 1 | -1/+1 |
| * | | | | | | | Fix silent crash if 3rdparty dir is not available | Victor Dubiniuk | 2014-07-30 | 1 | -11/+16 |
| | |_|_|_|_|/ | |/| | | | | |