summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use util function to protect datadirectory in setupBart Visscher2012-11-131-3/+2
* [tx-robot] updated from transifexJenkins for ownCloud2012-11-1392-1645/+1931
* Merge pull request #319 from owncloud/fileactions_newfileicewind19912012-11-121-6/+10
|\
| * add actions to newly created files and foldersRobin Appelman2012-11-071-0/+2
| * reuse jquery object when adding files to the file listRobin Appelman2012-11-071-6/+8
* | Merge pull request #157 from owncloud/setupBart Visscher2012-11-123-54/+59
|\ \
| * | DRY for creating htaccess to protect data-directoryBart Visscher2012-10-302-3/+5
| * | Separate control code from class definitionBart Visscher2012-10-303-51/+54
* | | Fix deleting multiple user w-o reloading V2Brice Maron2012-11-121-1/+4
* | | LDAP: cherrypick objectGUID handling from stable45, was part of PR 344Arthur Schiwon2012-11-121-1/+35
* | | Merge pull request #368 from butonic/i18n_of_cancel_buttonLukas Reschke2012-11-121-2/+5
|\ \ \
| * | | add i18n for cancel buttonJörn Friedrich Dreyer2012-11-121-2/+5
* | | | Merge pull request #371 from butonic/sql_and_error_log_fixesblizzz2012-11-121-2/+5
|\ \ \ \ | |/ / / |/| | |
| * | | add missing sql backticks, check sharing for error and add logJörn Friedrich Dreyer2012-11-121-2/+5
* | | | [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 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