summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* indentationJörn Friedrich Dreyer2013-09-181-43/+43
* simplify conflict template handling, fix reopen after ESCJörn Friedrich Dreyer2013-09-182-14/+12
* move upload dialog css to separate fileJörn Friedrich Dreyer2013-09-184-85/+121
* allow passing classes to buttonsJörn Friedrich Dreyer2013-09-181-0/+3
* hide excessive logging with a trace flagJörn Friedrich Dreyer2013-09-182-23/+26
* Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-182-179/+183
|\
| * Merge pull request #4769 from owncloud/gitignore_apps_fixJörn Friedrich Dreyer2013-09-181-1/+1
| |\
| | * fix gitignore for all apps* foldersJörn Friedrich Dreyer2013-09-161-1/+1
| * | Merge pull request #4872 from owncloud/refactor_upload_progressJörn Friedrich Dreyer2013-09-181-135/+173
| |\ \
| | * | refactor upload progressJörn Friedrich Dreyer2013-09-161-135/+173
| | |/
* | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-183-18/+26
|\| |
| * | Merge pull request #4889 from owncloud/disable_avatar_loading_on_public_uploa...Morris Jobke2013-09-181-3/+5
| |\ \
| | * | disable avatar loading on public guest pageJörn Friedrich Dreyer2013-09-171-3/+5
| * | | Merge pull request #4708 from owncloud/encryption_fixesBjörn Schießle2013-09-183-18/+26
| |\ \ \ | | |/ / | |/| |
| | * | performance improvement, check configuration only if no private key existsBjoern Schiessle2013-09-171-7/+12
| | * | check if stream wrapper is already registered to avoid warningBjoern Schiessle2013-09-031-1/+3
| | * | make sure that initial encryption also starts for a fresh installationBjoern Schiessle2013-09-032-11/+12
* | | | we cannot load avatar on guest pageJörn Friedrich Dreyer2013-09-171-3/+5
* | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-171-1/+10
|\| | |
| * | | Merge pull request #4871 from owncloud/add_exists_method_to_jqueryBernhard Posselt2013-09-171-1/+10
| |\ \ \
| | * | | add exists method to jqueryJörn Friedrich Dreyer2013-09-161-1/+10
| | | |/ | | |/|
* | | | use existsJörn Friedrich Dreyer2013-09-171-1/+1
* | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-17546-8769/+22458
|\| | |
| * | | Merge pull request #4825 from owncloud/fix-sharing-expiration-oracleBart Visscher2013-09-165-11/+218
| |\ \ \
| | * | | Calculate dateInPast and dateInFuture.Andreas Fischer2013-09-121-5/+8
| | * | | Compare objects directly. Also use $expected and $actual.Andreas Fischer2013-09-121-6/+6
| | * | | Add database tests for INSERT/SELECT date format.Andreas Fischer2013-09-123-0/+80
| | * | | Register EventSubscriber that resets Oracle's NLS_DATE_FORMAT etc.Andreas Fischer2013-09-121-0/+1
| | * | | Create instance of Doctrine\Common\EventManager() in OC_DB.Andreas Fischer2013-09-121-1/+2
| | * | | Add comment explaining how $dateInFuture was picked.Andreas Fischer2013-09-121-0/+2
| | * | | Coding style: { for methods start are supposed to be on the same line.Andreas Fischer2013-09-121-12/+6
| | * | | Expiration tests for sharing with groups.Andreas Fischer2013-09-121-6/+76
| | * | | Do not repeat shareUserOneTestFileWithUserTwo() code.Andreas Fischer2013-09-121-25/+22
| | * | | Make dates test class properties.Andreas Fischer2013-09-121-2/+5
| | * | | Try to make Oracle happy by also specifying seconds.Andreas Fischer2013-09-121-2/+2
| | * | | Test whether a still-valid user share is still accessible.Andreas Fischer2013-09-121-11/+34
| | * | | Test whether an expired user share is still accessible.Andreas Fischer2013-09-121-0/+33
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-16297-7339/+12951
| | |/ / | |/| |
| * | | Merge pull request #4838 from owncloud/refactor_upload_jsThomas Müller2013-09-163-33/+26
| |\ \ \
| | * | | refactor upload js & html to always use only js to fill form dataJörn Friedrich Dreyer2013-09-133-33/+26
| * | | | Merge pull request #4862 from owncloud/db_to_publicThomas Müller2013-09-161-0/+11
| |\ \ \ \
| | * | | | Add OCP\DB::getErrorMessage() to public namespace.Thomas Tanghus2013-09-161-0/+11
| |/ / / /
| * | | | Merge pull request #4860 from owncloud/fixing-potential-null-storage-on-scann...icewind19912013-09-151-0/+6
| |\ \ \ \
| | * | | | adding null check on a mount's storageThomas Müller2013-09-151-0/+6
| |/ / / /
| * | | | Merge pull request #4835 from owncloud/fix-apps-heightMorris Jobke2013-09-151-2/+2
| |\ \ \ \
| | * | | | use lineheight instead of padding and heightBernhard Posselt2013-09-131-2/+2
| | |/ / /
| * | | | Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enterMorris Jobke2013-09-151-2/+4
| |\ \ \ \
| | * | | | no autoFocus if no users returnedPete McFarlane2013-09-111-1/+3
| | * | | | Added autoFocus to #shareWith autocomplete optionsPete McFarlane2013-09-111-3/+3
| * | | | | Merge pull request #4853 from owncloud/external-shared_mimetype-iconsThomas Müller2013-09-152-16/+10
| |\ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 11:17:51 +0000