| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | | | | * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-18 | 2 | -179/+183 | |
| | | | | | |\ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | | Merge pull request #4769 from owncloud/gitignore_apps_fix | Jörn Friedrich Dreyer | 2013-09-18 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | fix gitignore for all apps* folders | Jörn Friedrich Dreyer | 2013-09-16 | 1 | -1/+1 | |
| * | | | | | | | | Merge pull request #4872 from owncloud/refactor_upload_progress | Jörn Friedrich Dreyer | 2013-09-18 | 1 | -135/+173 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | refactor upload progress | Jörn Friedrich Dreyer | 2013-09-16 | 1 | -135/+173 | |
| | |/ / / / / / / | ||||||
| | | | | | | * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-18 | 3 | -18/+26 | |
| | | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | | Merge pull request #4889 from owncloud/disable_avatar_loading_on_public_uploa... | Morris Jobke | 2013-09-18 | 1 | -3/+5 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | disable avatar loading on public guest page | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -3/+5 | |
| | | |_|_|_|/ / / | |/| | | | | | | ||||||
| * | | | | | | | | Merge pull request #4708 from owncloud/encryption_fixes | Björn Schießle | 2013-09-18 | 3 | -18/+26 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| | * | | | | | | | performance improvement, check configuration only if no private key exists | Bjoern Schiessle | 2013-09-17 | 1 | -7/+12 | |
| | * | | | | | | | check if stream wrapper is already registered to avoid warning | Bjoern Schiessle | 2013-09-03 | 1 | -1/+3 | |
| | * | | | | | | | make sure that initial encryption also starts for a fresh installation | Bjoern Schiessle | 2013-09-03 | 2 | -11/+12 | |
| | | | | | | * | | we cannot load avatar on guest page | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -3/+5 | |
| | | | | | | * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -1/+10 | |
| | | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | | Merge pull request #4871 from owncloud/add_exists_method_to_jquery | Bernhard Posselt | 2013-09-17 | 1 | -1/+10 | |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| | * | | | | | | | add exists method to jquery | Jörn Friedrich Dreyer | 2013-09-16 | 1 | -1/+10 | |
| | | |/ / / / / | |/| | | | | | ||||||
| | | | | | * | | use exists | Jörn Friedrich Dreyer | 2013-09-17 | 1 | -1/+1 | |
| | | | | | * | | Merge branch 'master' into fix_3728_with_file_exists_dialog | Jörn Friedrich Dreyer | 2013-09-17 | 546 | -8769/+22458 | |
| | | | | | |\ \ | |_|_|_|_|/ / |/| | | | | | | ||||||
| * | | | | | | | Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle | Bart Visscher | 2013-09-16 | 5 | -11/+218 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Calculate dateInPast and dateInFuture. | Andreas Fischer | 2013-09-12 | 1 | -5/+8 | |
| | * | | | | | | | Compare objects directly. Also use $expected and $actual. | Andreas Fischer | 2013-09-12 | 1 | -6/+6 | |
| | * | | | | | | | Add database tests for INSERT/SELECT date format. | Andreas Fischer | 2013-09-12 | 3 | -0/+80 | |
| | * | | | | | | | Register EventSubscriber that resets Oracle's NLS_DATE_FORMAT etc. | Andreas Fischer | 2013-09-12 | 1 | -0/+1 | |
| | * | | | | | | | Create instance of Doctrine\Common\EventManager() in OC_DB. | Andreas Fischer | 2013-09-12 | 1 | -1/+2 | |
| | * | | | | | | | Add comment explaining how $dateInFuture was picked. | Andreas Fischer | 2013-09-12 | 1 | -0/+2 | |
| | * | | | | | | | Coding style: { for methods start are supposed to be on the same line. | Andreas Fischer | 2013-09-12 | 1 | -12/+6 | |
| | * | | | | | | | Expiration tests for sharing with groups. | Andreas Fischer | 2013-09-12 | 1 | -6/+76 | |
| | * | | | | | | | Do not repeat shareUserOneTestFileWithUserTwo() code. | Andreas Fischer | 2013-09-12 | 1 | -25/+22 | |
| | * | | | | | | | Make dates test class properties. | Andreas Fischer | 2013-09-12 | 1 | -2/+5 | |
| | * | | | | | | | Try to make Oracle happy by also specifying seconds. | Andreas Fischer | 2013-09-12 | 1 | -2/+2 | |
| | * | | | | | | | Test whether a still-valid user share is still accessible. | Andreas Fischer | 2013-09-12 | 1 | -11/+34 | |
| | * | | | | | | | Test whether an expired user share is still accessible. | Andreas Fischer | 2013-09-12 | 1 | -0/+33 | |
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-16 | 297 | -7339/+12951 | |
| | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | | Merge pull request #4838 from owncloud/refactor_upload_js | Thomas Müller | 2013-09-16 | 3 | -33/+26 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | refactor upload js & html to always use only js to fill form data | Jörn Friedrich Dreyer | 2013-09-13 | 3 | -33/+26 | |
| * | | | | | | | | Merge pull request #4862 from owncloud/db_to_public | Thomas Müller | 2013-09-16 | 1 | -0/+11 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Add OCP\DB::getErrorMessage() to public namespace. | Thomas Tanghus | 2013-09-16 | 1 | -0/+11 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Merge pull request #4860 from owncloud/fixing-potential-null-storage-on-scann... | icewind1991 | 2013-09-15 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | adding null check on a mount's storage | Thomas Müller | 2013-09-15 | 1 | -0/+6 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Merge pull request #4835 from owncloud/fix-apps-height | Morris Jobke | 2013-09-15 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | use lineheight instead of padding and height | Bernhard Posselt | 2013-09-13 | 1 | -2/+2 | |
| | |/ / / / / / / | ||||||
| * | | | | | | | | Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enter | Morris Jobke | 2013-09-15 | 1 | -2/+4 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | no autoFocus if no users returned | Pete McFarlane | 2013-09-11 | 1 | -1/+3 | |
| | * | | | | | | | | Added autoFocus to #shareWith autocomplete options | Pete McFarlane | 2013-09-11 | 1 | -3/+3 | |
| * | | | | | | | | | Merge pull request #4853 from owncloud/external-shared_mimetype-icons | Thomas Müller | 2013-09-15 | 2 | -16/+10 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Use external and shared icons in OC.Dialogs.filepicker() | kondou | 2013-09-14 | 2 | -16/+10 | |
| * | | | | | | | | | | Merge pull request #4506 from owncloud/oc_avatars | Bernhard Posselt | 2013-09-14 | 20 | -2/+578 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Remove superfluous $ | kondou | 2013-09-14 | 1 | -1/+1 | |
| | * | | | | | | | | | | Merge branch 'master' into oc_avatars | kondou | 2013-09-12 | 511 | -3418/+12124 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Add a comment to clear defaultavatar-functionality | kondou | 2013-09-11 | 1 | -0/+1 | |
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |