Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | Merge pull request #6868 from owncloud/enc-fixrandomfailunittest | Vincent Petry | 2014-01-21 | 7 | -35/+35 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| | * | | | | | | | | Replaced time() with uniqid() to make sure the file name is unique | Vincent Petry | 2014-01-21 | 7 | -35/+35 | |
| * | | | | | | | | | Merge branch 'master' into fix-setupfs-only-for-existing-users-master | Thomas Müller | 2014-01-21 | 4 | -19/+25 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | OC_Util::setupFS($user) will create a data dir for the given string - no matt... | Thomas Müller | 2014-01-21 | 5 | -4/+8 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' into fixing-gallery-password-protected-access-master | Thomas Müller | 2014-01-21 | 4 | -19/+25 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | don't use the user id within the versions preview call as it could be used to... | Thomas Müller | 2014-01-21 | 3 | -15/+14 | |
| * | | | | | | | | user workarount to compare CLOB column with CHAR value | Jörn Friedrich Dreyer | 2014-01-21 | 1 | -4/+11 | |
| |/ / / / / / / | ||||||
* / / / / / / / | adding password protection check to getShareByToken() | Thomas Müller | 2014-01-21 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #6849 from owncloud/checkupdate-reuse | icewind1991 | 2014-01-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Reuse the data retrieved from the cache in checkUpdate | Robin Appelman | 2014-01-20 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #6851 from owncloud/files-fixtrashandversionrootsizecalc | Vincent Petry | 2014-01-20 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | When reading the size of "files" mountpoints need to be excluded | Vincent Petry | 2014-01-20 | 2 | -2/+2 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge pull request #6827 from rnveach/fix_6730 | Morris Jobke | 2014-01-20 | 2 | -1/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | added trigger to redo selection text on a directory change | rnveach | 2014-01-17 | 1 | -0/+2 | |
| * | | | | | | | fixed selector string and removed all checkbox if it was selected | rnveach | 2014-01-17 | 1 | -1/+2 | |
* | | | | | | | | Merge pull request #6819 from owncloud/files-ispreviewenabledwarningfix | Vincent Petry | 2014-01-19 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fixed isPreviewAvailable warnings in log | Vincent Petry | 2014-01-17 | 2 | -2/+2 | |
* | | | | | | | | | add link to documentation | Bjoern Schiessle | 2014-01-17 | 1 | -0/+4 | |
* | | | | | | | | | Merge pull request #6810 from kofemann/for-upstream | Vincent Petry | 2014-01-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | webdav: return SPACE_UNKNOWN if server do not support quota | Tigran Mkrtchyan | 2014-01-17 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #6807 from owncloud/enc_updated_description | Vincent Petry | 2014-01-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | updated description of the files encryption app | Bjoern Schiessle | 2014-01-17 | 1 | -1/+1 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #6264 from owncloud/files-draggabledestroy | Morris Jobke | 2014-01-16 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix to not destroy draggable when no draggable was set | Vincent Petry | 2014-01-14 | 1 | -1/+4 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfix | Vincent Petry | 2014-01-15 | 3 | -19/+33 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixed Dropbox/Google storage async save call | Vincent Petry | 2013-12-06 | 3 | -19/+33 | |
* | | | | | | | | Merge pull request #6780 from owncloud/trash_bin_copy_recursively | Björn Schießle | 2014-01-15 | 2 | -5/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | remove old code | Bjoern Schiessle | 2014-01-15 | 1 | -3/+0 | |
| * | | | | | | | | don't try to encrypt/decrypt cache chunks or files in the trash bin | Bjoern Schiessle | 2014-01-15 | 1 | -2/+2 | |
| * | | | | | | | | copy files to owner trash recursively | Bjoern Schiessle | 2014-01-15 | 1 | -3/+6 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Show the name of the shared folder in the breadcrumb when viewing a publicly ... | Robin Appelman | 2014-01-15 | 2 | -1/+7 | |
* | | | | | | | | call getFileInfo to enforce a file cache entry for the new version, fix #6286 | Bjoern Schiessle | 2014-01-15 | 1 | -2/+4 | |
|/ / / / / / / | ||||||
* | | | | | | | typo, grammar | Arthur Schiwon | 2014-01-14 | 1 | -1/+1 | |
* | | | | | | | LDAP: only read config from database, if configID is given. Not what we want ... | Arthur Schiwon | 2014-01-14 | 1 | -1/+2 | |
* | | | | | | | remove unused variables | Arthur Schiwon | 2014-01-14 | 1 | -2/+2 | |
* | | | | | | | LDAP: fix TLS detection | Arthur Schiwon | 2014-01-14 | 1 | -2/+5 | |
* | | | | | | | Merge pull request #6759 from owncloud/extstorage-smbtimezonefix | Vincent Petry | 2014-01-14 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixed timezone issue with SMB storage | Vincent Petry | 2014-01-14 | 1 | -1/+1 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | it is not an urgent error... a DEBUG message is enough at this point | Bjoern Schiessle | 2014-01-14 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #6755 from owncloud/remove-ru_RU-master | Andreas Fischer | 2014-01-14 | 5 | -53/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | remove ru_RU - it has bee removed from transifex | Thomas Müller | 2014-01-13 | 5 | -53/+0 | |
* | | | | | | | | don't unshare on delete | Bjoern Schiessle | 2014-01-13 | 1 | -8/+0 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-bla... | Vincent Petry | 2014-01-13 | 2 | -16/+32 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Fix ```createCertificateBundle``` and ```getCertificates``` methods | Carlos Cerrillo | 2013-12-17 | 1 | -4/+2 | |
| * | | | | | | Fixing tab/space coding style | Carlos Cerrillo | 2013-12-17 | 1 | -17/+21 | |
| * | | | | | | Fixing Issue #6301 on master branch | Carlos Cerrillo | 2013-12-15 | 1 | -6/+20 | |
* | | | | | | | Fixed various file name escaping issues in core apps | Vincent Petry | 2014-01-10 | 8 | -47/+68 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | Merge pull request #6687 from owncloud/sharing-fixpartfilehandling | Vincent Petry | 2014-01-09 | 1 | -21/+12 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Removed special handling of part files in shared storage rename | Vincent Petry | 2014-01-08 | 1 | -21/+12 | |
* | | | | | | Merge pull request #6681 from owncloud/userreport | blizzz | 2014-01-08 | 4 | -28/+201 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | |