Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-01 | 1 | -0/+2 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #10051 from owncloud/preview-empty-text | Thomas Müller | 2014-07-31 | 5 | -4/+71 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use svg mimeicons for empty text files | Robin Appelman | 2014-07-30 | 5 | -4/+71 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-31 | 5 | -0/+39 | |
* | | | | | 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 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #10024 from owncloud/preview-restrict-height | Morris Jobke | 2014-07-30 | 1 | -2/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Also keep maxY into account when scaling a preview while preserving aspect ratio | Robin Appelman | 2014-07-30 | 1 | -2/+8 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #10000 from owncloud/fix-lowlat-cache-autoload | Jörn Friedrich Dreyer | 2014-07-30 | 2 | -11/+22 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Add registerAutoloaderCache(). | Andreas Fischer | 2014-07-29 | 1 | -15/+18 | |
| * | | | | | Memcache\Factory: Remove static, use globalPrefix. | Andreas Fischer | 2014-07-29 | 2 | -4/+14 | |
| * | | | | | InstanceId is properly injected into factory. Remove comment. | Andreas Fischer | 2014-07-29 | 1 | -2/+0 | |
* | | | | | | Merge pull request #9970 from owncloud/sharing_set_expire_date | Morris Jobke | 2014-07-30 | 1 | -1/+2 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | make sure that we set the expire date if a date is adefault date is set | Bjoern Schiessle | 2014-07-28 | 1 | -1/+2 | |
* | | | | | | Merge pull request #9888 from owncloud/mysql-tinyint-master | Thomas Müller | 2014-07-30 | 1 | -0/+13 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | migration test for sqlite - adding type mapping for 'tinyint unsigned' | Thomas Müller | 2014-07-29 | 1 | -0/+13 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #9914 from owncloud/fix-appframework-blank-template | Thomas Müller | 2014-07-30 | 1 | -1/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix template rendering for 'blank' templates | Morris Jobke | 2014-07-29 | 1 | -1/+3 | |
| | |_|/ / / | |/| | | | | ||||||
* / | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-30 | 15 | -0/+34 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #9988 from owncloud/sharing_remove_share_permission | Björn Schießle | 2014-07-29 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | remove share permission if user is excluded from sharing | Bjoern Schiessle | 2014-07-29 | 1 | -1/+1 | |
| |/ / / | ||||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-29 | 2 | -1/+14 | |
|/ / / | ||||||
* | | | Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date | Björn Schießle | 2014-07-28 | 4 | -9/+83 | |
|\ \ \ | ||||||
| * | | | add OCS api call to set expire date for link shares | Bjoern Schiessle | 2014-07-25 | 4 | -9/+83 | |
* | | | | Merge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hoster | Morris Jobke | 2014-07-28 | 2 | -2/+27 | |
|\ \ \ \ | ||||||
| * | | | | generate copy of sqlite database file in data directory | Thomas Müller | 2014-07-28 | 2 | -2/+27 | |
* | | | | | Merge pull request #9924 from owncloud/eventsource-nginx-buffering | Robin Appelman | 2014-07-28 | 1 | -0/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Prevent nginx from buffering event source events | Robin Appelman | 2014-07-26 | 1 | -0/+2 | |
* | | | | | | Merge pull request #9784 from josh4trunks/libreoffice_match_cl | Thomas Müller | 2014-07-28 | 1 | -3/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Cleanup Document Preview | josh4trunks | 2014-07-22 | 1 | -3/+2 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #9641 from owncloud/localuser-addressbook | Thomas Müller | 2014-07-28 | 2 | -0/+113 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | ownCloud users are exported as address book | Thomas Müller | 2014-07-24 | 2 | -0/+113 | |
* | | | | | | | Merge pull request #9631 from owncloud/update-getid3 | Thomas Müller | 2014-07-28 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | add autoload | Morris Jobke | 2014-07-25 | 1 | -2/+0 | |
| * | | | | | | update getID3 library | Morris Jobke | 2014-07-25 | 1 | -1/+1 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #9819 from owncloud/updater-setversionafterupdate | Thomas Müller | 2014-07-28 | 1 | -2/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Set version AFTER a successful update | Vincent Petry | 2014-07-23 | 1 | -2/+3 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #9859 from tiezdne/master | Thomas Müller | 2014-07-28 | 1 | -0/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Update mimetypes.list.php | tiezdne | 2014-07-24 | 1 | -0/+2 | |
* | | | | | | | Merge pull request #9905 from owncloud/joblist-non-existing-class | Thomas Müller | 2014-07-28 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Dont try to execute jobs that no longer exist | Robin Appelman | 2014-07-25 | 1 | -1/+4 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #9935 from owncloud/harden-get-urlco | Thomas Müller | 2014-07-28 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | Verify whether the URL is valid | Lukas Reschke | 2014-07-27 | 1 | -0/+5 | |
* | | | | | | | Merge pull request #9904 from owncloud/loggedout-getuserfolder | Thomas Müller | 2014-07-28 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Dont throw an error when calling $server->getUserFolder when logged out | Robin Appelman | 2014-07-25 | 1 | -1/+5 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #9843 from owncloud/dont-silently-exit-in-cli-mode-master | Thomas Müller | 2014-07-28 | 1 | -7/+9 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | reorder if statements to remove negation, indentation correction | Jörn Friedrich Dreyer | 2014-07-25 | 1 | -9/+9 |