aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2322 from PHLAK/masterJan-Christoph Borchardt2013-03-163-1/+3
|\
| * Added 3rdparty folder as a git submoduleChris Kankiewicz2013-03-143-1/+3
* | Merge pull request #2360 from sherbrecher/masterLukas Reschke2013-03-151-1/+1
|\ \
| * \ Merge remote-tracking branch 'upstream/master'sherbrecher2013-03-153353-381397/+213437
| |\ \ | |/ / |/| |
* | | Merge pull request #2350 from aschoenebeck/ignore_blacklisted_filesBernhard Posselt2013-03-151-0/+1
|\ \ \
| * | | Filter display of blacklisted filesAndreas Schönebeck2013-03-151-0/+1
* | | | Merge pull request #2320 from ceri/masterFrank Karlitschek2013-03-151-2/+2
|\ \ \ \
| * | | | Correct emails when folders are shared.Ceri Davies2013-03-141-2/+2
* | | | | remove backticks around table namesBjörn Schießle2013-03-151-3/+3
* | | | | add backtick for db queries to prevent postgresql errorsBjörn Schießle2013-03-151-3/+3
| |/ / / |/| | |
* | | | Merge pull request #2336 from eMerzh/fix_trashpgBjörn Schießle2013-03-152-12/+12
|\ \ \ \
| * | | | Add backtick for trash app to prevent pg errorsBrice Maron2013-03-152-12/+12
* | | | | Merge pull request #2317 from owncloud/create_version_on_uploadFrank Karlitschek2013-03-151-3/+10
|\ \ \ \ \
| * | | | | fix var nameBjörn Schießle2013-03-141-2/+2
| * | | | | fix var nameBjörn Schießle2013-03-141-1/+1
| * | | | | create new version if the same file is uploaded again over the web interfaceBjörn Schießle2013-03-141-3/+10
| | |_|_|/ | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-1551-484/+620
| |/ / / |/| | |
* | | | Merge pull request #2318 from owncloud/unkown-freespaceBernhard Posselt2013-03-141-1/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Return unknown freespace if the free_space call failedRobin Appelman2013-03-141-1/+5
|/ / /
* | | replace \MDB with \OC_DB, approved in #2278Björn Schießle2013-03-141-1/+1
* | | use display name as sender for private link mails, approved in #2294Björn Schießle2013-03-141-1/+1
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-03-1433-473/+617
* | Merge pull request #2277 from owncloud/fix_sharing_hooksBernhard Posselt2013-03-131-1/+1
|\ \
| * | we need to listen to the pre delete hook, otherwise the file is already goneBjörn Schießle2013-03-131-1/+1
* | | Merge pull request #2265 from owncloud/no_share_option_for_shared_folderBjörn Schießle2013-03-131-1/+1
|\ \ \ | |/ / |/| |
| * | only prevent shared action for the Shared folder in the root dirBjörn Schießle2013-03-131-1/+1
| * | don't add share action to the Shared folderBjörn Schießle2013-03-121-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-1326-129/+143
* | | Fix file sharing via public link for one particular file.Olivier Tétard2013-03-121-1/+1
* | | Merge pull request #2254 from owncloud/fixing-mssql-utf8-and-insert-empty-str...Thomas Müller2013-03-122-3/+8
|\ \ \
| * | | enable UTF-8 charset on mssqlThomas Mueller2013-03-121-2/+4
| * | | write error message to log file in case insert to file cache failed - took ho...Thomas Mueller2013-03-121-1/+4
| |/ /
* | | Merge pull request #2253 from owncloud/fixing-windows-file-mapper-masterThomas Müller2013-03-125-14/+20
|\ \ \
| * | | fixing various filesystem/storage unit tests on windowsThomas Mueller2013-03-123-8/+12
| * | | skip archive tests for nowThomas Mueller2013-03-122-0/+4
| * | | adding //IGNORE to iconv to prevent nasty php warningsThomas Mueller2013-03-121-1/+1
| * | | slug generates uniqid in case the file/folder name contains not one single va...Thomas Mueller2013-03-121-4/+2
| * | | indexed slug should be created based on logic pathThomas Mueller2013-03-121-1/+1
| |/ /
* | | Merge pull request #2145 from eMerzh/preserve_debugJan-Christoph Borchardt2013-03-121-1/+5
|\ \ \
| * | | Preserve Debug flag accross config writesBrice Maron2013-03-061-1/+5
* | | | Merge pull request #2234 from owncloud/fix_ldap_edirectoryFrank Karlitschek2013-03-121-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | LDAP: compatibility with Novell eDirectory UUIDArthur Schiwon2013-03-111-2/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-1228-277/+311
* | | | this is now 6.0 pre alphaFrank Karlitschek2013-03-091-2/+2
* | | | 5.0.0v5.0.0Frank Karlitschek2013-03-091-2/+2
* | | | Merge pull request #2236 from owncloud/fix-migrationBernhard Posselt2013-03-111-0/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Check if username is valid and remove slashes from filenameLukas Reschke2013-03-111-0/+9
|/ / /
* | | Merge pull request #2183 from owncloud/fix-shared-statuses-againBernhard Posselt2013-03-112-62/+51
|\ \ \
| * | | Update share.jsBernhard Posselt2013-03-081-2/+2
| * | | Fix #2080 and fix #2141Michael Gapczynski2013-03-072-62/+51
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 10:15:09 +0000