aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Better way of getting the navigation entries for an appBart Visscher2013-02-082-4/+18
* Merge pull request #1539 from owncloud/fixing-1508-masterBart Visscher2013-02-081-1/+1
|\
| * missing comma in sql statementThomas Müller2013-02-081-1/+1
* | Merge pull request #1534 from owncloud/files_l10nThomas Müller2013-02-083-6/+10
|\ \ | |/ |/|
| * Files: explicitly defineRobin Appelman2013-02-082-0/+4
| * Files: rename 'space' to 'storage' in upload.phpRobin Appelman2013-02-071-1/+1
| * Files: add translation support back to move/renameRobin Appelman2013-02-072-5/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-08417-2774/+7832
* | Merge pull request #1527 from owncloud/simplyfy_file_mimetype_parsingicewind19912013-02-071-4/+3
|\ \
| * | simplyfy mimetype parsing of 'file' outputJörn Friedrich Dreyer2013-02-071-4/+3
* | | Merge pull request #1514 from owncloud/fix-setupLukas Reschke2013-02-076-8/+10
|\ \ \
| * | | Fill oc_webroot with the expected valueBart Visscher2013-02-071-0/+1
| * | | Fix disabling setup form on submitBart Visscher2013-02-071-5/+3
| * | | Define the variables that are expected to exist but won't be set in setupBart Visscher2013-02-071-0/+3
| * | | Move loading of js_config to templatelayoutBart Visscher2013-02-074-3/+3
* | | | Merge pull request #1529 from owncloud/installation-login-fixesThomas Müller2013-02-073-28/+22
|\ \ \ \
| * | | | make show password toggle work for installation (once #1525 is fixed)Jan-Christoph Borchardt2013-02-072-4/+6
| * | | | make show password not specific to log inJan-Christoph Borchardt2013-02-072-7/+6
| * | | | remove duplicate show password toggle code, move current one to proper locationJan-Christoph Borchardt2013-02-071-19/+11
| * | | | some comments for CSS documentationJan-Christoph Borchardt2013-02-071-3/+3
| * | | | fix database labels having left paddingJan-Christoph Borchardt2013-02-071-0/+1
| | |/ / | |/| |
* | | | Merge pull request #1507 from tripflex/masterBart Visscher2013-02-071-1/+1
|\ \ \ \
| * | | | Remove left float from actions div classMyles McNamara2013-02-061-1/+1
* | | | | Merge pull request #1526 from owncloud/l10n-support-masterLukas Reschke2013-02-077-14/+25
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | l10n support enhanced in coreThomas Mueller2013-02-072-3/+3
| * | | | l10n support enhanced in files_versionsThomas Mueller2013-02-071-1/+1
| * | | | l10n support enhanced in files_trashbinThomas Mueller2013-02-072-3/+6
| * | | | l10n support enhanced in files_versionThomas Mueller2013-02-073-8/+16
* | | | | Merge pull request #1530 from owncloud/fix-warning-displayname-layoutblizzz2013-02-072-1/+4
|\ \ \ \ \
| * | | | | Fix warning with displayname in user layout templateBart Visscher2013-02-072-1/+4
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1531 from owncloud/cron_no_routesblizzz2013-02-072-9/+15
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix previous commitRobin Appelman2013-02-071-1/+1
| * | | | Use dummy request method in CLIRobin Appelman2013-02-071-1/+5
| * | | | Don't try to use routes when called from cliRobin Appelman2013-02-071-8/+10
|/ / / /
* | | | Merge pull request #1524 from owncloud/fix_ldaps_tls_settingblizzz2013-02-072-4/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | TypoArthur Schiwon2013-02-071-1/+1
| * | | LDAP: better detect timeouts. do not try to reconnect. do not try to bind whe...Arthur Schiwon2013-02-061-3/+10
| * | | LDAP: when ldaps and tls are configured, disable the latter one - they do not...Arthur Schiwon2013-02-061-0/+5
| * | | LDAP: info string improvedArthur Schiwon2013-02-061-1/+1
* | | | Merge pull request #1451 from eMerzh/fix_1065Thomas Müller2013-02-071-0/+3
|\ \ \ \
| * | | | Add Redirect to getUrlContent fix #1065Brice Maron2013-02-041-0/+3
* | | | | Merge pull request #1518 from schiesbn/trash_layout_fixblizzz2013-02-071-1/+1
|\ \ \ \ \
| * | | | | add class hascontrols to trash bin file tableBjörn Schießle2013-02-071-1/+1
* | | | | | Merge pull request #1522 from schiesbn/trash_bin_fixBjörn Schießle2013-02-075-9/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | remove debug outputBjörn Schießle2013-02-071-1/+0
| * | | | | rename OCA_Trash to OCA\Files_TrashbinBjörn Schießle2013-02-075-7/+7
| * | | | | OCA_Versions is now known as OCA\Files_VersionsBjörn Schießle2013-02-071-1/+1
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-07339-4724/+6613
* | | | | Merge pull request #1500 from chriskoch/patch-1Frank Karlitschek2013-02-061-2/+2
|\ \ \ \ \
| * | | | | Update lib/public/util.phpChristian Koch2013-02-061-2/+2