summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* separate uploading code from progress code, add progress capability detectionJörn Friedrich Dreyer2013-09-053-114/+131
* refactor dialog creationJörn Friedrich Dreyer2013-09-043-7/+38
* Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-04319-2704/+3768
|\
| * Merge pull request #4473 from owncloud/texteditor_polishingJörn Friedrich Dreyer2013-09-031-1/+1
| |\
| | * Revert "remove editor div in filelist", add "is deprecated" commentJörn Friedrich Dreyer2013-09-031-0/+1
| | * remove editor div in filelistJörn Friedrich Dreyer2013-08-161-1/+0
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-09-038-7/+37
| * | This function doesn't cache anymore. Adjusted PHPDoc to suit.ringmaster2013-09-021-1/+1
| * | Don't cache the pkey, skip generation if the keyfile existsringmaster2013-09-022-13/+11
| * | Employ config option for OpenSSL config file, if provided.Owen Winkler2013-09-022-6/+20
| * | Start a branch for easier OpenSSL configuration.Owen Winkler2013-09-022-1/+12
| * | Merge pull request #4671 from owncloud/emptycontentBernhard Posselt2013-09-014-10/+4
| |\ \
| | * | rename emptyfolder to emptycontentAlessandro Cosentino2013-08-312-3/+3
| | * | text centered horizontally and vertically in emptycontent divAlessandro Cosentino2013-08-312-7/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-0149-32/+96
| |/ /
| * | fix issue with filetable backgroundGeorg Ehrke2013-08-301-1/+1
| * | Merge master into oc_previewGeorg Ehrke2013-08-3073-300/+164
| |\ \
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-3072-296/+163
| | * | prefix 'tbody tr' to separate app/core css errorspetemcfarlane2013-08-301-1/+1
| * | | use gerMimeTypeDetector detectPath instead of getMimeTypeGeorg Ehrke2013-08-301-1/+1
| * | | Merge master into oc_previewGeorg Ehrke2013-08-2985-354/+1742
| |\| |
| | * | Merge pull request #3926 from owncloud/improve_filesummaryThomas Müller2013-08-284-40/+127
| | |\ \
| | | * | Reimplement filesummary in JSkondou2013-08-284-40/+127
| | * | | also move empty folders to the trash bin as discussed here #4590Bjoern Schiessle2013-08-281-5/+0
| | * | | Merge pull request #4489 from owncloud/clean-3rdparty-mess-masterBart Visscher2013-08-2815-2/+1506
| | |\ \ \ | | | |/ / | | |/| |
| | | * | fixing require pathThomas Müller2013-08-182-2/+2
| | | * | moving Dropbox and smb4php 3rdparty code over to the appsThomas Müller2013-08-1715-2/+1506
| | * | | Merge pull request #4601 from owncloud/fixing-4341-masterMorris Jobke2013-08-283-27/+33
| | |\ \ \
| | | * | | backport of #4357 to masterThomas Müller2013-08-273-27/+33
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-281-1/+3
| | |/ / /
| | * | | Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacementMorris Jobke2013-08-271-1/+1
| | |\ \ \
| | | * | | Fix "select all" checkbox displacement when checkedPellaeon Lin2013-08-261-1/+1
| | * | | | LDAP: case insensitive replace for more robustnessArthur Schiwon2013-08-271-1/+1
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2751-85/+63
| | * | | | the trash bin can also contain empty files. Don't use the trash bin size as i...Bjoern Schiessle2013-08-271-4/+5
| | * | | | Merge pull request #4586 from owncloud/fixing-3431-masterMorris Jobke2013-08-277-186/+0
| | |\ \ \ \
| | | * | | | kill zh_CN.GB2312Thomas Müller2013-08-277-186/+0
| | * | | | | storage information is path specificThomas Müller2013-08-272-2/+2
| | |/ / / /
| * | | | | use random string as id for checkboxGeorg Ehrke2013-08-261-1/+2
| * | | | | fix background size in filelist.jsGeorg Ehrke2013-08-261-1/+1
| * | | | | Merge master into oc_previewGeorg Ehrke2013-08-2614-217/+52
| |\| | | |
| | * | | | Merge pull request #4542 from owncloud/fixing-4504-masterMorris Jobke2013-08-262-198/+7
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | remove duplicate codeThomas Müller2013-08-222-198/+7
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-258-13/+28
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-234-0/+11
| * | | | | fix preview issue when uploading a file with parenthesesGeorg Ehrke2013-08-261-1/+3
| * | | | | move path generation for previews to dedicated functionGeorg Ehrke2013-08-232-3/+8
| * | | | | Merge branch 'master' into oc_previewGeorg Ehrke2013-08-2396-477/+243
| |\| | | |
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-225-10/+16
| | * | | | Merge pull request #4537 from owncloud/no-realpathThomas Müller2013-08-228-76/+76
| | |\ \ \ \