Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | save current work state of office fallback | Georg Ehrke | 2013-06-11 | 2 | -26/+81 |
* | check if imagick is loaded in office.php, not in libreoffice-cl.php | Georg Ehrke | 2013-06-11 | 2 | -53/+51 |
* | code optimization | Georg Ehrke | 2013-06-11 | 6 | -19/+7 |
* | don't crop Y axis | Georg Ehrke | 2013-06-11 | 1 | -1/+2 |
* | implement previews for single shared files | Georg Ehrke | 2013-06-10 | 1 | -15/+24 |
* | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-06-10 | 559 | -1146/+1181 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-10 | 529 | -1045/+1045 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-09 | 521 | -1040/+1040 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-08 | 557 | -1151/+1184 |
| * | Merge pull request #2919 from owncloud/hook-improvements | Michael Gapczynski | 2013-06-07 | 1 | -6/+8 |
| |\ | |||||
| | * | Merge branch 'master' into hook-improvements | Michael Gapczynski | 2013-06-04 | 1691 | -65985/+65795 |
| | |\ | |||||
| | * | | Don't unlink old renamed file if stream copy failed | Michael Gapczynski | 2013-04-13 | 1 | -1/+3 |
| | * | | Check if operation worked before sending post hooks, fixes #2484 | Michael Gapczynski | 2013-04-13 | 1 | -4/+4 |
| * | | | Merge pull request #3628 from owncloud/update_3rdparty_submodule | Morris Jobke | 2013-06-07 | 1 | -0/+0 |
| |\ \ \ | |||||
| | * | | | update 3rdparty submodule | Georg Ehrke | 2013-06-07 | 1 | -0/+0 |
| |/ / / | |||||
* | | | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-06-07 | 127 | -651/+1131 |
|\| | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-07 | 53 | -222/+372 |
| * | | | Merge pull request #3622 from owncloud/read-extfx-confg-from-home | Thomas Müller | 2013-06-06 | 1 | -0/+9 |
| |\ \ \ | |||||
| | * | | | Read configuratons for external filesystem test from a private place. | Thomas Mueller | 2013-06-07 | 1 | -0/+9 |
| |/ / / | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-06 | 37 | -115/+176 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-05 | 62 | -341/+598 |
| | |/ | |/| | |||||
| * | | Merge pull request #3594 from opensaucesystems/patch-1 | Thomas Müller | 2013-06-04 | 1 | -3/+4 |
| |\ \ | |||||
| | * | | Added input[type="url"] to styles.css | opensaucesystems | 2013-06-04 | 1 | -3/+4 |
| * | | | exclude 3rdparty folder within files_external and files_encryption from code ... | Thomas Mueller | 2013-06-04 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-06-06 | 729 | -3860/+7225 |
|\| | | |||||
| * | | LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600 | Arthur Schiwon | 2013-06-04 | 1 | -0/+4 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-04 | 148 | -632/+636 |
| * | | ignore l10n folder within remaining apps | Thomas Mueller | 2013-06-04 | 1 | -0/+8 |
| * | | Cache Test: set datadir to temporary location, otherwise initmountpoints will... | Arthur Schiwon | 2013-06-03 | 1 | -2/+8 |
| * | | Cache: mount user mountpoints to make sure that // exists before accessing it... | Arthur Schiwon | 2013-06-03 | 1 | -0/+1 |
| * | | Merge pull request #3444 from owncloud/share-fix | Jörn Friedrich Dreyer | 2013-06-03 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix undefined index for share mount point retrieval | Michael Gapczynski | 2013-05-21 | 1 | -1/+1 |
| * | | | Merge pull request #3581 from owncloud/publicphp_maintenance | Jörn Friedrich Dreyer | 2013-06-03 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | public.php - check if maintenance mode is enabled | Georg Ehrke | 2013-06-03 | 1 | -0/+1 |
| * | | | | Merge pull request #3561 from owncloud/user | icewind1991 | 2013-06-03 | 13 | -412/+1893 |
| |\ \ \ \ | |||||
| | * | | | | also clear cached users when removing a single backend | Robin Appelman | 2013-06-03 | 1 | -0/+1 |
| | * | | | | use caching for userExists | Robin Appelman | 2013-06-03 | 1 | -6/+3 |
| | * | | | | cast result to bool | Robin Appelman | 2013-06-03 | 1 | -1/+2 |
| | * | | | | move phpdoc comments | Robin Appelman | 2013-06-03 | 3 | -2/+52 |
| | * | | | | User: return backend result | Robin Appelman | 2013-06-03 | 1 | -2/+1 |
| | * | | | | User: consisten variable naming | Robin Appelman | 2013-06-03 | 1 | -9/+9 |
| | * | | | | User: remove determineDisplayName | Robin Appelman | 2013-06-03 | 1 | -19/+9 |
| | * | | | | adding PHPDoc comment to getManager() | Thomas Mueller | 2013-06-01 | 1 | -1/+10 |
| | * | | | | fix namespacing error | Robin Appelman | 2013-06-01 | 1 | -3/+3 |
| | * | | | | fix undefined variables | Robin Appelman | 2013-06-01 | 1 | -2/+2 |
| | * | | | | use single quotes | Robin Appelman | 2013-06-01 | 1 | -10/+10 |
| | * | | | | user should set into session before postLogin hook otherwise it will break no... | Florin Peter | 2013-05-31 | 1 | -1/+1 |
| | * | | | | fix broken tests | Florin Peter | 2013-05-31 | 1 | -1/+1 |
| | * | | | | Fix postLogin hook | Robin Appelman | 2013-05-31 | 2 | -2/+2 |
| | * | | | | fix typo | Robin Appelman | 2013-05-31 | 1 | -1/+1 |