Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'refs/merge-requests/127' of ↵ | Michael Gapczynski | 2012-06-13 | 23 | -54/+73 |
|\ | | | | | | | | | | | | | | | git://gitorious.org/owncloud/owncloud into merge-requests/127 Conflicts: apps/files_external/templates/settings.php lib/template.php | ||||
| * | Removed unecessary sanitization | Lukas Reschke | 2012-06-11 | 1 | -1/+1 |
| | | |||||
| * | Removed double sanitization | Lukas Reschke | 2012-06-11 | 5 | -11/+11 |
| | | |||||
| * | Fix double sanitization | Lukas Reschke | 2012-06-11 | 1 | -1/+1 |
| | | |||||
| * | Fixes a issue with the log | Lukas Reschke | 2012-06-11 | 1 | -2/+2 |
| | | |||||
| * | Removed some unessecary sanitizations | Lukas Reschke | 2012-06-11 | 5 | -8/+8 |
| | | |||||
| * | Make some apps compatible | Lukas Reschke | 2012-06-11 | 17 | -35/+64 |
| | | |||||
| * | Check for string | Lukas Reschke | 2012-06-11 | 1 | -14/+2 |
| | | |||||
| * | Some updates... | Lukas Reschke | 2012-06-11 | 1 | -14/+28 |
| | | |||||
| * | Handling arrays | Lukas Reschke | 2012-06-11 | 1 | -1/+16 |
| | | |||||
| * | Revert | Lukas Reschke | 2012-06-11 | 16 | -111/+78 |
| | | |||||
| * | Settings... | Lukas Reschke | 2012-06-11 | 5 | -16/+16 |
| | | |||||
| * | First try of implementing assignHTML | Lukas Reschke | 2012-06-11 | 11 | -59/+78 |
| | | |||||
* | | Add support for mounting Google Drive in external storage UI | Michael Gapczynski | 2012-06-13 | 7 | -2/+1059 |
| | | |||||
* | | Remove check for encryption. | Thomas Tanghus | 2012-06-13 | 1 | -5/+0 |
| | | |||||
* | | Remove debug statements. | Thomas Tanghus | 2012-06-13 | 2 | -19/+0 |
| | | |||||
* | | Contacts: implemented CSRF prevention. | Thomas Tanghus | 2012-06-13 | 14 | -6/+52 |
| | | |||||
* | | Added JSON methods for CSRF prevention. Make request token accessible from ↵ | Thomas Tanghus | 2012-06-13 | 5 | -22/+54 |
| | | | | | | | | template and add js var. | ||||
* | | fix time call | Frank Karlitschek | 2012-06-13 | 1 | -1/+1 |
| | | |||||
* | | urlencode link fort password reset (bug #970) | Bjoern Schiessle | 2012-06-13 | 1 | -1/+1 |
| | | |||||
* | | Fix incorrect creation of filesystem for user@group in data folder during shares | Michael Gapczynski | 2012-06-12 | 1 | -4/+4 |
| | | |||||
* | | check for view before trying to invoke method on object | Bartek Przybylski | 2012-06-13 | 1 | -1/+1 |
| | | |||||
* | | fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-987 | Thomas Mueller | 2012-06-12 | 1 | -1/+5 |
| | | |||||
* | | Create directory for mount point if it doesn't already exist | Michael Gapczynski | 2012-06-12 | 1 | -0/+3 |
| | | |||||
* | | increase version of calendar app to force db upgrade | Georg Ehrke | 2012-06-12 | 1 | -1/+1 |
| | | |||||
* | | increase possible size of uri in database - fix oc-140 | Georg Ehrke | 2012-06-12 | 1 | -2/+2 |
| | | |||||
* | | Add support for mounting Dropbox in external storage UI | Michael Gapczynski | 2012-06-12 | 5 | -42/+150 |
| | | |||||
* | | Label the delete operation "unshare" for files in the "Shared" folder to reduce | Bjoern Schiessle | 2012-06-12 | 1 | -1/+5 |
| | | | | | | | | confusion about the operation. | ||||
* | | block slashes only for new files and new folders but not for file upload ↵ | Bjoern Schiessle | 2012-06-12 | 1 | -1/+1 |
| | | | | | | | | from url (bug #964) | ||||
* | | Contacts: Final (for now) fix to encoding probs on import. | Thomas Tanghus | 2012-06-12 | 1 | -1/+2 |
| | | |||||
* | | committed patch (bug #967) to add missing translations for file actions | Bjoern Schiessle | 2012-06-12 | 1 | -2/+2 |
| | | |||||
* | | applied patch provided by bug #966 to fix broken user specific quota settings | Bjoern Schiessle | 2012-06-12 | 3 | -48/+76 |
| | | |||||
* | | PDF.JS updated, compatibility.js added for browser support, should fix: oc-395 | Thomas Mueller | 2012-06-12 | 8 | -659/+4465 |
| | | |||||
* | | utf8 in der DB config | Marco B | 2012-06-11 | 5 | -5/+5 |
| | | |||||
* | | Add .vimrc to .gitignore. | Thomas Tanghus | 2012-06-11 | 1 | -0/+3 |
| | | |||||
* | | Fix js for missing address fields. | Thomas Tanghus | 2012-06-11 | 1 | -6/+6 |
| | | |||||
* | | Quick fix for index errors when not importing from files. | Thomas Tanghus | 2012-06-11 | 1 | -1/+1 |
| | | |||||
* | | Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit ↵ | Thomas Tanghus | 2012-06-11 | 1 | -2/+2 |
| | | | | | | | | 95cc9730aa49963a69e46154b0cba19232219d2e | ||||
* | | Contacts: Fix encoding errors, import errors, developer headache, paint cute ↵ | Thomas Tanghus | 2012-06-11 | 1 | -1/+1 |
| | | | | | | | | kittens and pink clouds ;-) | ||||
* | | Tasks: Fix resizing of the content part | Bart Visscher | 2012-06-11 | 1 | -2/+5 |
| | | |||||
* | | Gallery: remove extra include of lib/base.php | Bart Visscher | 2012-06-11 | 1 | -2/+0 |
| | | |||||
* | | Calendar: remove unused markup from #controls | Bart Visscher | 2012-06-11 | 1 | -23/+15 |
| | | |||||
* | | replace "=0D=0A" (\r\n) with a simple "\n" in vards during import | Bjoern Schiessle | 2012-06-11 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' of gitorious.org:owncloud/owncloud | Bjoern Schiessle | 2012-06-11 | 2 | -1/+3 |
|\ \ | |||||
| * | | LDAP: offer config option for Group Display Name attribute | Arthur Schiwon | 2012-06-11 | 2 | -1/+3 |
| | | | |||||
* | | | make sure that contact data are always utf8 encoded to avoid encoding problems | Bjoern Schiessle | 2012-06-11 | 1 | -2/+2 |
|/ / | |||||
* | | Redirect HTTP Auth requests to REQUEST_URI. Partial fix for ↵ | Thomas Tanghus | 2012-06-11 | 1 | -0/+1 |
| | | | | | | | | http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-874 | ||||
* | | Allow same host redirects (/somepath). | Thomas Tanghus | 2012-06-11 | 1 | -1/+2 |
| | | |||||
* | | Contacts: Fix NOTE also on add, not just save. | Thomas Tanghus | 2012-06-11 | 1 | -2/+11 |
|/ | |||||
* | ldap: check array for emptiness, not nullness | Arthur Schiwon | 2012-06-11 | 1 | -1/+1 |
| |