Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove admin settings from app.php | Björn Schießle | 2013-02-27 | 1 | -2/+0 |
* | Merge branch 'master' into versions_cleanup | Björn Schießle | 2013-02-27 | 11 | -12/+33 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-27 | 7 | -1/+20 |
| * | Merge pull request #1953 from owncloud/escape_regular_expressions | Frank Karlitschek | 2013-02-27 | 2 | -4/+3 |
| |\ | |||||
| | * | escape regular expressions; fix typo in variable name | Björn Schießle | 2013-02-27 | 2 | -4/+3 |
| * | | Merge pull request #1948 from owncloud/improve_user_sorting | Bernhard Posselt | 2013-02-27 | 1 | -1/+10 |
| |\ \ | |||||
| | * | | LDAP: sort users on server-side | Arthur Schiwon | 2013-02-26 | 1 | -1/+10 |
| * | | | Merge pull request #1905 from owncloud/fix-share-icons | Thomas Müller | 2013-02-27 | 1 | -6/+0 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | remove general CSS from IE specific rules, displays Shared state permanently ... | Jan-Christoph Borchardt | 2013-02-26 | 1 | -6/+0 |
* | | | | rename History to Versions | Björn Schießle | 2013-02-27 | 1 | -2/+2 |
* | | | | remove admin settings for versions | Björn Schießle | 2013-02-27 | 4 | -38/+0 |
|/ / / | |||||
* | | | Merge pull request #1949 from owncloud/fix-dropbox | Michael Gapczynski | 2013-02-26 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Fix undefined root parameter in Dropbox storage | Michael Gapczynski | 2013-02-26 | 1 | -2/+2 |
| | |/ | |/| | |||||
* / | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-27 | 6 | -1/+32 |
|/ / | |||||
* | | Add missing echo | Lukas Reschke | 2013-02-26 | 1 | -1/+1 |
* | | cleanPath needs to be public | Björn Schießle | 2013-02-26 | 1 | -1/+1 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-26 | 4 | -1/+28 |
|/ | |||||
* | fixed bug that prevented a newly created file to be opened with registered fi... | Bernhard Posselt | 2013-02-25 | 1 | -1/+1 |
* | Merge pull request #1864 from owncloud/fix_display_default | Frank Karlitschek | 2013-02-25 | 1 | -7/+4 |
|\ | |||||
| * | LDAP: simplify default for user home settings, fixes wrong display of default... | Arthur Schiwon | 2013-02-22 | 1 | -7/+4 |
* | | Merge pull request #1890 from owncloud/trashbin_fix | Björn Schießle | 2013-02-25 | 2 | -10/+12 |
|\ \ | |||||
| * | | fix quota calculation | Björn Schießle | 2013-02-25 | 2 | -9/+11 |
| * | | fix getVersion call | Björn Schießle | 2013-02-25 | 1 | -1/+1 |
* | | | Merge pull request #1892 from owncloud/files_remove_row_on_delete | Björn Schießle | 2013-02-25 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | delete table row if file was deleted instead of just hide it | Björn Schießle | 2013-02-25 | 1 | -1/+1 |
| |/ / | |||||
* / / | use distance option to delay dragging in sane browsers | Jörn Friedrich Dreyer | 2013-02-25 | 1 | -0/+4 |
|/ / | |||||
* | | fix line endings | Björn Schießle | 2013-02-25 | 1 | -94/+94 |
* | | Merge branch 'master' into update-expire-function | Björn Schießle | 2013-02-25 | 8 | -108/+188 |
|\ \ | |||||
| * \ | Merge pull request #1810 from owncloud/trashbin_encryption | Björn Schießle | 2013-02-25 | 5 | -107/+172 |
| |\ \ | |||||
| | * | | some final code clean-up | Björn Schießle | 2013-02-25 | 1 | -4/+7 |
| | * | | always use "===" | Björn Schießle | 2013-02-25 | 1 | -5/+5 |
| | * | | Merge branch 'master' into trashbin_encryption | Björn Schießle | 2013-02-25 | 114 | -396/+664 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into trashbin_encryption | Björn Schießle | 2013-02-21 | 22 | -117/+156 |
| | |\ \ \ | |||||
| | * | | | | don't show empty trash bin message for sub folders | Björn Schießle | 2013-02-21 | 2 | -1/+2 |
| | * | | | | update path to deleted files | Björn Schießle | 2013-02-20 | 1 | -3/+2 |
| | * | | | | some fixes for the keyfile handling | Björn Schießle | 2013-02-20 | 1 | -10/+28 |
| | * | | | | update script which copies all trash bin related files to user/files_trashbin | Björn Schießle | 2013-02-20 | 2 | -1/+41 |
| | * | | | | reuse delete() function in expire() | Björn Schießle | 2013-02-20 | 1 | -21/+3 |
| | * | | | | delete keyfiles if file in trash bin gets deleted permanently | Björn Schießle | 2013-02-20 | 1 | -5/+20 |
| | * | | | | restore filekeys from trash bin | Björn Schießle | 2013-02-20 | 1 | -5/+17 |
| | * | | | | put all trash bin content in user/files_trashbin | Björn Schießle | 2013-02-20 | 1 | -33/+31 |
| | * | | | | move2trash() handles keyfiles | Björn Schießle | 2013-02-19 | 1 | -9/+18 |
| * | | | | | Merge pull request #1827 from owncloud/fix_getVersions | Bernhard Posselt | 2013-02-25 | 2 | -3/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | fix getVersions(), we need to get the correct user and filename | Björn Schießle | 2013-02-21 | 2 | -3/+3 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #1832 from owncloud/fix_1779 | Thomas Müller | 2013-02-25 | 1 | -0/+18 |
| |\ \ \ \ \ | |||||
| | * | | | | | use :hover pseudo class to set opacity | Jörn Friedrich Dreyer | 2013-02-21 | 1 | -0/+18 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #1833 from owncloud/fix_1465 | Thomas Müller | 2013-02-25 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | IE8 does not support window.onclick | Jörn Friedrich Dreyer | 2013-02-21 | 1 | -1/+1 |
| | |/ / / | |||||
* | | | | | Merge branch 'master' into update-expire-function | Björn Schießle | 2013-02-25 | 104 | -400/+586 |
|\| | | | | |||||
| * | | | | Merge pull request #1856 from owncloud/fix_error_handling_stream_copy | Frank Karlitschek | 2013-02-25 | 1 | -1/+2 |
| |\ \ \ \ |