aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* remove admin settings from app.phpBjörn Schießle2013-02-271-2/+0
* Merge branch 'master' into versions_cleanupBjörn Schießle2013-02-2711-12/+33
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-02-277-1/+20
| * Merge pull request #1953 from owncloud/escape_regular_expressionsFrank Karlitschek2013-02-272-4/+3
| |\
| | * escape regular expressions; fix typo in variable nameBjörn Schießle2013-02-272-4/+3
| * | Merge pull request #1948 from owncloud/improve_user_sortingBernhard Posselt2013-02-271-1/+10
| |\ \
| | * | LDAP: sort users on server-sideArthur Schiwon2013-02-261-1/+10
| * | | Merge pull request #1905 from owncloud/fix-share-iconsThomas Müller2013-02-271-6/+0
| |\ \ \ | | |_|/ | |/| |
| | * | remove general CSS from IE specific rules, displays Shared state permanently ...Jan-Christoph Borchardt2013-02-261-6/+0
* | | | rename History to VersionsBjörn Schießle2013-02-271-2/+2
* | | | remove admin settings for versionsBjörn Schießle2013-02-274-38/+0
|/ / /
* | | Merge pull request #1949 from owncloud/fix-dropboxMichael Gapczynski2013-02-261-2/+2
|\ \ \
| * | | Fix undefined root parameter in Dropbox storageMichael Gapczynski2013-02-261-2/+2
| | |/ | |/|
* / | [tx-robot] updated from transifexJenkins for ownCloud2013-02-276-1/+32
|/ /
* | Add missing echoLukas Reschke2013-02-261-1/+1
* | cleanPath needs to be publicBjörn Schießle2013-02-261-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-264-1/+28
|/
* fixed bug that prevented a newly created file to be opened with registered fi...Bernhard Posselt2013-02-251-1/+1
* Merge pull request #1864 from owncloud/fix_display_defaultFrank Karlitschek2013-02-251-7/+4
|\
| * LDAP: simplify default for user home settings, fixes wrong display of default...Arthur Schiwon2013-02-221-7/+4
* | Merge pull request #1890 from owncloud/trashbin_fixBjörn Schießle2013-02-252-10/+12
|\ \
| * | fix quota calculationBjörn Schießle2013-02-252-9/+11
| * | fix getVersion callBjörn Schießle2013-02-251-1/+1
* | | Merge pull request #1892 from owncloud/files_remove_row_on_deleteBjörn Schießle2013-02-251-1/+1
|\ \ \
| * | | delete table row if file was deleted instead of just hide itBjörn Schießle2013-02-251-1/+1
| |/ /
* / / use distance option to delay dragging in sane browsersJörn Friedrich Dreyer2013-02-251-0/+4
|/ /
* | fix line endingsBjörn Schießle2013-02-251-94/+94
* | Merge branch 'master' into update-expire-functionBjörn Schießle2013-02-258-108/+188
|\ \
| * \ Merge pull request #1810 from owncloud/trashbin_encryptionBjörn Schießle2013-02-255-107/+172
| |\ \
| | * | some final code clean-upBjörn Schießle2013-02-251-4/+7
| | * | always use "==="Björn Schießle2013-02-251-5/+5
| | * | Merge branch 'master' into trashbin_encryptionBjörn Schießle2013-02-25114-396/+664
| | |\ \
| | * \ \ Merge branch 'master' into trashbin_encryptionBjörn Schießle2013-02-2122-117/+156
| | |\ \ \
| | * | | | don't show empty trash bin message for sub foldersBjörn Schießle2013-02-212-1/+2
| | * | | | update path to deleted filesBjörn Schießle2013-02-201-3/+2
| | * | | | some fixes for the keyfile handlingBjörn Schießle2013-02-201-10/+28
| | * | | | update script which copies all trash bin related files to user/files_trashbinBjörn Schießle2013-02-202-1/+41
| | * | | | reuse delete() function in expire()Björn Schießle2013-02-201-21/+3
| | * | | | delete keyfiles if file in trash bin gets deleted permanentlyBjörn Schießle2013-02-201-5/+20
| | * | | | restore filekeys from trash binBjörn Schießle2013-02-201-5/+17
| | * | | | put all trash bin content in user/files_trashbinBjörn Schießle2013-02-201-33/+31
| | * | | | move2trash() handles keyfilesBjörn Schießle2013-02-191-9/+18
| * | | | | Merge pull request #1827 from owncloud/fix_getVersionsBernhard Posselt2013-02-252-3/+3
| |\ \ \ \ \
| | * | | | | fix getVersions(), we need to get the correct user and filenameBjörn Schießle2013-02-212-3/+3
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #1832 from owncloud/fix_1779Thomas Müller2013-02-251-0/+18
| |\ \ \ \ \
| | * | | | | use :hover pseudo class to set opacityJörn Friedrich Dreyer2013-02-211-0/+18
| | |/ / / /
| * | | | | Merge pull request #1833 from owncloud/fix_1465Thomas Müller2013-02-251-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | IE8 does not support window.onclickJörn Friedrich Dreyer2013-02-211-1/+1
| | |/ / /
* | | | | Merge branch 'master' into update-expire-functionBjörn Schießle2013-02-25104-400/+586
|\| | | |
| * | | | Merge pull request #1856 from owncloud/fix_error_handling_stream_copyFrank Karlitschek2013-02-251-1/+2
| |\ \ \ \