summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 5 beta 2v5.0.0beta2Frank Karlitschek2013-02-251-2/+2
|
* Merge pull request #1894 from owncloud/texfixFrank Karlitschek2013-02-251-1/+1
|\ | | | | fixed bug that prevented a newly created file to be opened with register...
| * fixed bug that prevented a newly created file to be opened with registered ↵Bernhard Posselt2013-02-251-1/+1
|/ | | | files actions
* Merge pull request #1891 from owncloud/set_timeoutBernhard Posselt2013-02-251-1/+9
|\ | | | | use a 5 sec timeout for the webdav check
| * use a 5 sec timeout for the webdav checkFrank Karlitschek2013-02-251-1/+9
| |
* | 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 de...
| * | LDAP: simplify default for user home settings, fixes wrong display of ↵Arthur Schiwon2013-02-221-7/+4
| | | | | | | | | | | | default value in settings
* | | Merge pull request #1890 from owncloud/trashbin_fixBjörn Schießle2013-02-252-10/+12
|\ \ \ | | | | | | | | fix quota calculation for trash bin and versions
| * | | 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 it
| * | | | delete table row if file was deleted instead of just hide itBjörn Schießle2013-02-251-1/+1
| |/ / /
* | | | Merge pull request #1889 from owncloud/use_distance_optionThomas Müller2013-02-251-0/+4
|\ \ \ \ | | | | | | | | | | use distance option to delay dragging in sane browsers
| * | | | use distance option to delay dragging in sane browsersJörn Friedrich Dreyer2013-02-251-0/+4
| |/ / /
* | | | Merge pull request #1865 from owncloud/fix-displaying-db-errorsBjörn Schießle2013-02-252-3/+5
|\ \ \ \ | |/ / / |/| | | Don't use routes when displaying error page
| * | | Don't use routes when displaying error pageBart Visscher2013-02-222-3/+5
| | | |
* | | | Merge pull request #1823 from owncloud/update-expire-functionBjörn Schießle2013-02-256-80/+210
|\ \ \ \ | | | | | | | | | | Update expire function
| * | | | fix line endingsBjörn Schießle2013-02-251-94/+94
| | | | |
| * | | | Merge branch 'master' into update-expire-functionBjörn Schießle2013-02-2513-125/+288
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | Conflicts: apps/files_trashbin/appinfo/version apps/files_trashbin/lib/trash.php
* | | | | Merge pull request #1810 from owncloud/trashbin_encryptionBjörn Schießle2013-02-255-107/+172
|\ \ \ \ \ | | | | | | | | | | | | Trashbin file encryption support
| * | | | | 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-25506-4504/+8337
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_trashbin/index.php apps/files_trashbin/lib/trash.php
| * | | | | Merge branch 'master' into trashbin_encryptionBjörn Schießle2013-02-2159-241/+357
| |\ \ \ \ \
| * | | | | | 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 filename
| * | | | | | | 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 opacity
| * | | | | | | | 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-253-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix 1465
| * | | | | | | | IE8 does not support window.onclickJörn Friedrich Dreyer2013-02-213-3/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #1887 from owncloud/fixing-1843-masterBart Visscher2013-02-251-13/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | remove the check for session data folder - causes trouble on some enviro...
| * | | | | | | | remove the check for session data folder - causes trouble on some environmentsThomas Mueller2013-02-251-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | let's try to find another solution for =C6
* | | | | | | | | Merge pull request #1888 from Raydiation/masterBjörn Schießle2013-02-252-2/+98
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | Fixes apps require version checking
| * | | | | | | | more tests to fail the version checkBernhard Posselt2013-02-251-1/+15
| | | | | | | | |
| * | | | | | | | created unittests and factored out version test into seperate methodBernhard Posselt2013-02-252-4/+84
| | | | | | | | |
| * | | | | | | | spaces to tabsBernhard Posselt2013-02-251-4/+4
| | | | | | | | |
| * | | | | | | | version checks for apps now use all three version numbers and fixed bug that ↵Bernhard Posselt2013-02-251-2/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | would not do the version check correctly for the second version
| | | | | | * | Merge branch 'master' into update-expire-functionBjörn Schießle2013-02-25465-3726/+4577
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_trashbin/lib/trash.php
* | | | | | | | Merge pull request #1856 from owncloud/fix_error_handling_stream_copyFrank Karlitschek2013-02-255-12/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | don't use the number of written bytes as indicator if streamCopy() was successful
| * | | | | | | put value assignment into bracketsBjörn Schießle2013-02-221-1/+1
| | | | | | | |
| * | | | | | | return both, count and result if the operation succeeded or failed. Maybe in ↵Björn Schießle2013-02-225-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some cases it is useful to know how much bytes where copied
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-21 13:29:01 +0000