Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7725 from owncloud/body-public | Raghu Nayyar | 2014-03-14 | 1 | -1/+1 |
|\ | |||||
| * | add 'body-public' ID to body in base layout so it can be identified via CSS | Jan-Christoph Borchardt | 2014-03-14 | 1 | -1/+1 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-14 | 12 | -12/+12 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 23 | -3470/+12 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 72 | -408/+4760 |
* | Merge pull request #7686 from owncloud/ocs_fix_paths | Björn Schießle | 2014-03-13 | 3 | -7/+132 |
|\ | |||||
| * | finally fix the paths for the OCS Share API | Bjoern Schiessle | 2014-03-13 | 3 | -7/+132 |
* | | Merge pull request #7718 from owncloud/fixing-7345-master | Thomas Müller | 2014-03-13 | 1 | -0/+1 |
|\ \ | |||||
| * | | map transifex language ja_JP to ja | Thomas Müller | 2014-03-13 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #7340 from owncloud/hide_remove_image_avatar | Morris Jobke | 2014-03-13 | 1 | -0/+15 |
|\ \ | |||||
| * | | Use $.hide() instead of .hidden for now | kondou | 2014-03-12 | 1 | -3/+3 |
| * | | Remove OC.Router usage | kondou | 2014-03-12 | 1 | -7/+8 |
| * | | Merge branch 'master' into hide_remove_image_avatar | kondou | 2014-03-12 | 1539 | -49359/+80800 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into hide_remove_image_avatar | kondou | 2014-02-28 | 97 | -709/+1736 |
| |\ \ \ | |||||
| * | | | | Use addClass('hidden') and removeClass('hidden') | kondou | 2014-02-21 | 1 | -3/+3 |
| * | | | | Hide remove image, if there's no custom avatar | kondou | 2014-02-20 | 1 | -0/+14 |
* | | | | | Merge pull request #7671 from fpiraneo/patch-1 | Vincent Petry | 2014-03-13 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Update index.php | Francesco Piraneo G. | 2014-03-11 | 1 | -1/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 54 | -814/+898 |
* | | | | | Merge pull request #7681 from owncloud/remove-Sabre_DAV_Browser_Plugin-master | Lukas Reschke | 2014-03-12 | 1 | -1/+0 |
|\ \ \ \ \ | |||||
| * | | | | | remove Sabre_DAV_Browser_Plugin | Thomas Müller | 2014-03-12 | 1 | -1/+0 |
* | | | | | | Merge pull request #6632 from eduardosan/master | Vincent Petry | 2014-03-12 | 1 | -3/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove unused spaces | eduardo | 2014-01-08 | 1 | -2/+2 |
| * | | | | | | Remove name from code | eduardo | 2014-01-08 | 1 | -2/+0 |
| * | | | | | | Add tabs to conformance with owncloud code standards | eduardo | 2014-01-05 | 1 | -4/+4 |
| * | | | | | | Fix PostgreSQL port configuration on install | eduardo | 2014-01-04 | 1 | -3/+19 |
* | | | | | | | Merge pull request #7564 from owncloud/issue/7559 | Vincent Petry | 2014-03-12 | 2 | -3/+26 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use command -v to check for sendmail | Joas Schilling | 2014-03-12 | 1 | -1/+15 |
| * | | | | | | | Hide QMail when not selected and hide sendmail when not available on the server | Joas Schilling | 2014-03-05 | 2 | -3/+12 |
* | | | | | | | | Merge pull request #7669 from owncloud/versions_predelete | Vincent Petry | 2014-03-12 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add preDelete hook for files_versions app | Georg Ehrke | 2014-03-11 | 1 | -1/+4 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #7668 from owncloud/trashbin_predelete | Vincent Petry | 2014-03-12 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | add preDelete hook for files_trashbin app | Georg Ehrke | 2014-03-11 | 1 | -0/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #7695 from owncloud/fix-3rdparty-master | Thomas Müller | 2014-03-12 | 1 | -0/+0 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Re-add submodule 3rdparty | Thomas Müller | 2014-03-12 | 1 | -0/+0 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #7683 from owncloud/proper-content-type-on-ocs-exceptions | Vincent Petry | 2014-03-12 | 2 | -3/+32 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fixing method names | Thomas Müller | 2014-03-12 | 2 | -2/+1 |
| * | | | | | | | set content-type on ocs exceptions | Thomas Müller | 2014-03-12 | 2 | -3/+33 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #7682 from owncloud/sanitize-fallbackid-master | Lukas Reschke | 2014-03-12 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | sanitize fallbackId | Thomas Müller | 2014-03-12 | 1 | -1/+2 |
| |/ / / / / / | |||||
* / / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-12 | 755 | -3221/+4388 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #7674 from owncloud/fix-spelling-master | Thomas Müller | 2014-03-11 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Authentification -> Authentication | Thomas Müller | 2014-03-11 | 2 | -2/+2 |
* | | | | | | | Merge pull request #7665 from owncloud/fix_ocs_share_api_paths | Björn Schießle | 2014-03-11 | 3 | -10/+208 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | add 'received_from' info to the share, so that every share can have a differe... | Bjoern Schiessle | 2014-03-11 | 1 | -2/+4 |
| * | | | | | | fix path creation for re-shares, issue #7662 | Bjoern Schiessle | 2014-03-11 | 2 | -8/+204 |
* | | | | | | | Fix 3rdparty submodule after transifex sync broke it | Thomas Müller | 2014-03-11 | 1 | -0/+0 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #7650 from owncloud/quota-totalspace | Vincent Petry | 2014-03-11 | 3 | -1/+130 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed total space display when data size exceeds quota | Vincent Petry | 2014-03-10 | 3 | -1/+130 |
* | | | | | | | Merge pull request #7652 from owncloud/localStorage_remove | Vincent Petry | 2014-03-11 | 1 | -0/+3 |
|\ \ \ \ \ \ \ |