summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1551 from owncloud/fix_files_multiselectJörn Friedrich Dreyer2013-02-103-4/+3
|\
| * remove hascontrols from trash bin file list tableBjörn Schießle2013-02-101-1/+1
| * Remove hascontrols - use original positioning.Thomas Tanghus2013-02-092-4/+4
| * Another attempt on the filelist heading.Thomas Tanghus2013-02-091-2/+2
| * Fix filelist shifting up one row on (multi)selectThomas Tanghus2013-02-081-2/+1
* | Don't run external storage tests on defaultRobin Appelman2013-02-101-2/+2
* | Merge pull request #1564 from schiesbn/trash_bin_breadcrumbsBernhard Posselt2013-02-101-2/+2
|\ \
| * | initialize breadcrumbs arrayBjörn Schießle2013-02-091-1/+2
| * | don't add a extra 'Trash' breadcrumb since we have the home-symbol nowBjörn Schießle2013-02-091-1/+0
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-1092-246/+298
* | | Merge pull request #1570 from owncloud/refactor_filelist_addFile_addDirThomas Müller2013-02-091-43/+88
|\ \ \
| * | | extract common codeJörn Friedrich Dreyer2013-02-091-43/+88
* | | | Merge pull request #1383 from owncloud/files_encryption-style-fixesSam Tuke2013-02-0910-829/+685
|\ \ \ \ | |/ / / |/| | |
| * | | cleanup - more to come afterThomas Müller2013-02-0910-568/+403
| * | | Merge branch 'master' into files_encryption-style-fixesSam Tuke2013-02-09178-1054/+1197
| |\ \ \
| * \ \ \ Merge branch 'master' into files_encryption-style-fixesSam Tuke2013-02-0517-1410/+1716
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into files_encryption-style-fixesSam Tuke2013-02-05291-1535/+5149
| |\ \ \ \ \
| * | | | | | Fixed todos: undefined vars and unreachable codeSam Tuke2013-02-053-34/+33
| * | | | | | first style fixes - @samtuke: I added some TODO regarding undefined variables...Thomas Mueller2013-01-302-455/+485
* | | | | | | Merge pull request #1565 from owncloud/fix_replacingJörn Friedrich Dreyer2013-02-091-3/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | remove code properlyGeorg Ehrke2013-02-091-3/+0
* | | | | | | Merge pull request #1560 from owncloud/fix_replacingBernhard Posselt2013-02-091-2/+2
|\| | | | | |
| * | | | | | remove (comment out) old code to fix replacing of filesGeorg Ehrke2013-02-091-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #1562 from schiesbn/fix_namingBernhard Posselt2013-02-091-1/+1
|\ \ \ \ \ \
| * | | | | | rename trash to trash binBjörn Schießle2013-02-091-1/+1
| |/ / / / /
* | | | | | Merge pull request #1521 from schiesbn/label_fixedBjörn Schießle2013-02-091-4/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | don't call the delete button unshare, unshare operation no longer availableBjörn Schießle2013-02-071-4/+1
* | | | | | Merge pull request #1550 from owncloud/fix-files-download-linksJörn Friedrich Dreyer2013-02-092-2/+2
|\ \ \ \ \ \
| * | | | | | Fix files router download linksBart Visscher2013-02-082-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1541 from owncloud/fixing-1540-masterJörn Friedrich Dreyer2013-02-092-8/+0
|\ \ \ \ \ \
| * | | | | | remove unused codeThomas Müller2013-02-081-6/+0
| * | | | | | remove undefined function FileList.finishDeleteThomas Müller2013-02-081-2/+0
| |/ / / / /
* / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-02-0963-34/+118
|/ / / / /
* | | | | Merge pull request #1534 from owncloud/files_l10nThomas Müller2013-02-083-6/+10
|\ \ \ \ \
| * | | | | Files: explicitly defineRobin Appelman2013-02-082-0/+4
| * | | | | Files: rename 'space' to 'storage' in upload.phpRobin Appelman2013-02-071-1/+1
| * | | | | Files: add translation support back to move/renameRobin Appelman2013-02-072-5/+5
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-0862-42/+101
* | | | | | Merge pull request #1507 from tripflex/masterBart Visscher2013-02-071-1/+1
|\ \ \ \ \ \
| * | | | | | Remove left float from actions div classMyles McNamara2013-02-061-1/+1
* | | | | | | Merge pull request #1526 from owncloud/l10n-support-masterLukas Reschke2013-02-075-11/+22
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | l10n support enhanced in files_versionsThomas Mueller2013-02-071-1/+1
| * | | | | | l10n support enhanced in files_trashbinThomas Mueller2013-02-072-3/+6
| * | | | | | l10n support enhanced in files_versionThomas Mueller2013-02-073-8/+16
* | | | | | | Merge pull request #1524 from owncloud/fix_ldaps_tls_settingblizzz2013-02-072-4/+16
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | TypoArthur Schiwon2013-02-071-1/+1
| * | | | | | LDAP: better detect timeouts. do not try to reconnect. do not try to bind whe...Arthur Schiwon2013-02-061-3/+10
| * | | | | | LDAP: when ldaps and tls are configured, disable the latter one - they do not...Arthur Schiwon2013-02-061-0/+5
| * | | | | | LDAP: info string improvedArthur Schiwon2013-02-061-1/+1
* | | | | | | Merge pull request #1518 from schiesbn/trash_layout_fixblizzz2013-02-071-1/+1
|\ \ \ \ \ \ \