summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7725 from owncloud/body-publicRaghu Nayyar2014-03-141-1/+1
|\
| * add 'body-public' ID to body in base layout so it can be identified via CSSJan-Christoph Borchardt2014-03-141-1/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-1412-12/+12
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-1323-3470/+12
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-1372-408/+4760
* Merge pull request #7686 from owncloud/ocs_fix_pathsBjörn Schießle2014-03-133-7/+132
|\
| * finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-133-7/+132
* | Merge pull request #7718 from owncloud/fixing-7345-masterThomas Müller2014-03-131-0/+1
|\ \
| * | map transifex language ja_JP to jaThomas Müller2014-03-131-0/+1
|/ /
* | Merge pull request #7340 from owncloud/hide_remove_image_avatarMorris Jobke2014-03-131-0/+15
|\ \
| * | Use $.hide() instead of .hidden for nowkondou2014-03-121-3/+3
| * | Remove OC.Router usagekondou2014-03-121-7/+8
| * | Merge branch 'master' into hide_remove_image_avatarkondou2014-03-121539-49359/+80800
| |\ \
| * \ \ Merge branch 'master' into hide_remove_image_avatarkondou2014-02-2897-709/+1736
| |\ \ \
| * | | | Use addClass('hidden') and removeClass('hidden')kondou2014-02-211-3/+3
| * | | | Hide remove image, if there's no custom avatarkondou2014-02-201-0/+14
* | | | | Merge pull request #7671 from fpiraneo/patch-1Vincent Petry2014-03-131-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Update index.phpFrancesco Piraneo G.2014-03-111-1/+1
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1354-814/+898
* | | | | Merge pull request #7681 from owncloud/remove-Sabre_DAV_Browser_Plugin-masterLukas Reschke2014-03-121-1/+0
|\ \ \ \ \
| * | | | | remove Sabre_DAV_Browser_PluginThomas Müller2014-03-121-1/+0
* | | | | | Merge pull request #6632 from eduardosan/masterVincent Petry2014-03-121-3/+17
|\ \ \ \ \ \
| * | | | | | Remove unused spaceseduardo2014-01-081-2/+2
| * | | | | | Remove name from codeeduardo2014-01-081-2/+0
| * | | | | | Add tabs to conformance with owncloud code standardseduardo2014-01-051-4/+4
| * | | | | | Fix PostgreSQL port configuration on installeduardo2014-01-041-3/+19
* | | | | | | Merge pull request #7564 from owncloud/issue/7559Vincent Petry2014-03-122-3/+26
|\ \ \ \ \ \ \
| * | | | | | | Use command -v to check for sendmailJoas Schilling2014-03-121-1/+15
| * | | | | | | Hide QMail when not selected and hide sendmail when not available on the serverJoas Schilling2014-03-052-3/+12
* | | | | | | | Merge pull request #7669 from owncloud/versions_predeleteVincent Petry2014-03-121-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | add preDelete hook for files_versions appGeorg Ehrke2014-03-111-1/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #7668 from owncloud/trashbin_predeleteVincent Petry2014-03-121-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | add preDelete hook for files_trashbin appGeorg Ehrke2014-03-111-0/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #7695 from owncloud/fix-3rdparty-masterThomas Müller2014-03-121-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Re-add submodule 3rdpartyThomas Müller2014-03-121-0/+0
|/ / / / / / /
* | | | | | | Merge pull request #7683 from owncloud/proper-content-type-on-ocs-exceptionsVincent Petry2014-03-122-3/+32
|\ \ \ \ \ \ \
| * | | | | | | fixing method namesThomas Müller2014-03-122-2/+1
| * | | | | | | set content-type on ocs exceptionsThomas Müller2014-03-122-3/+33
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #7682 from owncloud/sanitize-fallbackid-masterLukas Reschke2014-03-121-1/+2
|\ \ \ \ \ \ \
| * | | | | | | sanitize fallbackIdThomas Müller2014-03-121-1/+2
| |/ / / / / /
* / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-03-12755-3221/+4388
|/ / / / / /
* | | | | | Merge pull request #7674 from owncloud/fix-spelling-masterThomas Müller2014-03-112-2/+2
|\ \ \ \ \ \
| * | | | | | Authentification -> AuthenticationThomas Müller2014-03-112-2/+2
* | | | | | | Merge pull request #7665 from owncloud/fix_ocs_share_api_pathsBjörn Schießle2014-03-113-10/+208
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | add 'received_from' info to the share, so that every share can have a differe...Bjoern Schiessle2014-03-111-2/+4
| * | | | | | fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-112-8/+204
* | | | | | | Fix 3rdparty submodule after transifex sync broke itThomas Müller2014-03-111-0/+0
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #7650 from owncloud/quota-totalspaceVincent Petry2014-03-113-1/+130
|\ \ \ \ \ \
| * | | | | | Fixed total space display when data size exceeds quotaVincent Petry2014-03-103-1/+130
* | | | | | | Merge pull request #7652 from owncloud/localStorage_removeVincent Petry2014-03-111-0/+3
|\ \ \ \ \ \ \