summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't use indexes in test data as postgres complains over duplicate keys.Thomas Tanghus2012-11-121-41/+0
* Change insertIfNotExist() for sqlite. Not fast, but more reliable than previo...Thomas Tanghus2012-11-121-12/+36
* Correct SQL syntax.Thomas Tanghus2012-11-121-1/+1
* Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-1237-185/+268
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-1225-80/+127
| * Merge pull request #361 from owncloud/cruds_consts_2Thomas Tanghus2012-11-1112-105/+141
| |\
| | * Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*Thomas Tanghus2012-11-1110-103/+99
| | * Added CRUDS permissions to the OCP namespace. Implements issue #345Thomas Tanghus2012-11-112-2/+42
| |/
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-11442-12444/+8896
|\|
| * Merge pull request #354 from michielbdejong/masterThomas Müller2012-11-101-0/+1
| |\
| | * add /.well-known/host-meta.json to .htaccessMichiel de Jong2012-11-101-0/+1
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-1118-37/+47
| * Disable loading apps before starting testsBart Visscher2012-11-101-0/+2
| * Merge pull request #346 from diederikdehaas/patch-checkstyle-build1341Thomas Müller2012-11-107-12/+12
| |\
| | * Fixed new checkstyle issues in apps.php from build #1341.Diederik de Haas2012-11-101-1/+1
| | * Fixed new checkstyle issues in ocs.php from build #1341.Diederik de Haas2012-11-101-1/+1
| | * Fixed new checkstyle issues in util.php from build #1341.Diederik de Haas2012-11-101-2/+2
| | * Fixed new checkstyle issues in migrate.php from build #1341.Diederik de Haas2012-11-101-2/+2
| | * Fixed new checkstyle issues in ftp.php from build #1341.Diederik de Haas2012-11-101-2/+2
| | * Fixed new checkstyle issues in swift.php from build #1341.Diederik de Haas2012-11-101-2/+2
| | * Fixed new checkstyle issues from build #1341.Diederik de Haas2012-11-101-2/+2
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-10158-6136/+1056
| * Merge pull request #340 from butonic/fix_quota_zero_cornercaseThomas Müller2012-11-091-8/+8
| |\
| | * fix quota off by one errorJörn Friedrich Dreyer2012-11-091-8/+8
| * | Merge pull request #337 from seidler2547/masterThomas Müller2012-11-093-1/+21
| |\ \ | | |/ | |/|
| | * Fix WebDAV (and Android Client) not being able to authorize on Debian Squeeze...Stefan Seidel2012-11-093-1/+21
| |/
| * Merge pull request #330 from owncloud/check_connectionThomas Müller2012-11-094-0/+43
| |\
| | * add a check and a warning if the ownClodu server is not able to establish htt...Frank Karlitschek2012-11-084-0/+43
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-09149-279/+1751
| * | l10n support for user_webdavauthThomas Mueller2012-11-092-0/+6
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-09278-2287/+2640
| * | Fix delete link when new user is addedBrice Maron2012-11-081-1/+8
| * | Merge pull request #261 from owncloud/fix_opera_file_deleteGeorg Ehrke2012-11-081-0/+3
| |\ \
| | * | fix file delete in opera - fixes #188Georg Ehrke2012-11-051-0/+3
| * | | Merge pull request #326 from owncloud/add_creditsThomas Müller2012-11-081-1/+6
| |\ \ \
| | * | | add credits to personal page too so that non admins can see what they run.Frank Karlitschek2012-11-081-1/+6
| | | |/ | | |/|
| * | | Merge pull request #324 from owncloud/fix_imageThomas Müller2012-11-083-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | fix the broken image path on the apps pageFrank Karlitschek2012-11-083-2/+2
| |/ /
| * | Migration: Allow for no app data cases; handle file copying betterTom Needham2012-11-081-7/+5
| * | Migration: On import of user accounts only import folders in home dir, use OC...Tom Needham2012-11-082-35/+13
| * | Correct more data vs attr to fix #189Brice Maron2012-11-071-2/+2
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-08173-4744/+4368
| * | normalize filepaths in OC_Files::getFileInfoRobin Appelman2012-11-071-0/+1
| * | Revert "fix blocking drag & drop upload of folders"Robin Appelman2012-11-071-2/+2
| * | check if $path is a empty stringBjörn Schießle2012-11-071-1/+1
| * | Merge pull request #307 from owncloud/etag-function-overwriteicewind19912012-11-071-2/+14
| |\ \
| | * | Allow changing the way etags are generatedRobin Appelman2012-11-071-2/+14
| * | | backport from approved patch in stable45:Björn Schießle2012-11-071-4/+1
* | | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-0723-73/+91
|\| | |
| * | | Fix quoting problem in fs mount. give Big DB error at least in PGBrice Maron2012-11-071-4/+4