Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2092 from owncloud/infieldlabels-placeholder | Lukas Reschke | 2013-03-04 | 1 | -2/+2 |
|\ | |||||
| * | explicitly add empty placeholder to inputs which use infield labels, fix #2049 | Jan-Christoph Borchardt | 2013-03-04 | 1 | -2/+2 |
* | | Merge pull request #2090 from owncloud/fixing-2089-master | Frank Karlitschek | 2013-03-04 | 1 | -1/+1 |
|\ \ | |||||
| * | | fixes #2089 | Thomas Mueller | 2013-03-04 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #2030 from j-ed/master | Bernhard Posselt | 2013-03-04 | 6 | -28/+28 |
|\ \ | |/ |/| | |||||
| * | Update app.php | j-ed | 2013-03-02 | 1 | -1/+1 |
| * | Update app.php | j-ed | 2013-03-02 | 1 | -2/+2 |
| * | Update app.php | j-ed | 2013-03-02 | 1 | -2/+2 |
| * | Update app.php | j-ed | 2013-03-02 | 1 | -7/+7 |
| * | Update app.php | j-ed | 2013-03-02 | 1 | -6/+6 |
| * | Update app.php | j-ed | 2013-03-02 | 1 | -10/+10 |
* | | Merge pull request #2082 from owncloud/fix-permissions-class | Bernhard Posselt | 2013-03-04 | 1 | -1/+1 |
|\ \ | |||||
| * | | Change remove() $user parameter to optional | Michael Gapczynski | 2013-03-04 | 1 | -1/+1 |
* | | | Merge pull request #2079 from owncloud/fix_expire_function | Bernhard Posselt | 2013-03-04 | 1 | -5/+5 |
|\ \ \ | |||||
| * | | | fix expire function | Björn Schießle | 2013-03-04 | 1 | -5/+5 |
| |/ / | |||||
* | | | Corrects Files Layout in Trashbin | raghunayyar | 2013-03-04 | 1 | -1/+1 |
* | | | fix files table CSS specificity issue causing multiselect bar overlap, fix #2075 | Jan-Christoph Borchardt | 2013-03-04 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #2073 from owncloud/trashbin_userHome | blizzz | 2013-03-04 | 1 | -4/+4 |
|\ \ | |||||
| * | | make trashbin work with different user homes | Björn Schießle | 2013-03-04 | 1 | -4/+4 |
* | | | damn copy&paste, fix wrong var name | Björn Schießle | 2013-03-04 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #2069 from owncloud/fix_sanitize_call | Lukas Reschke | 2013-03-04 | 2 | -2/+2 |
|\ \ | |||||
| * | | fix p() call | Björn Schießle | 2013-03-04 | 1 | -1/+1 |
| * | | use p() for the output and not for the comparison | Björn Schießle | 2013-03-04 | 1 | -1/+1 |
* | | | Merge pull request #2070 from owncloud/fix_quota | Björn Schießle | 2013-03-04 | 2 | -5/+5 |
|\ \ \ | |||||
| * | | | fix type in var name | Björn Schießle | 2013-03-04 | 2 | -2/+2 |
| * | | | fix quota calculation for trash and versions | Björn Schießle | 2013-03-04 | 2 | -5/+5 |
| |/ / | |||||
* | | | LDAP: orthograophy fix | Arthur Schiwon | 2013-03-04 | 1 | -1/+1 |
* | | | LDAP: typos in app description | Arthur Schiwon | 2013-03-04 | 2 | -3/+5 |
* | | | Merge pull request #2044 from owncloud/fix_1779_including_permanent_shares | Bart Visscher | 2013-03-04 | 1 | -1/+7 |
|\ \ \ | |||||
| * | | | durhurrrhurrr | Jörn Friedrich Dreyer | 2013-03-03 | 1 | -1/+7 |
* | | | | Datepicker height fixed. | raghunayyar | 2013-03-04 | 2 | -2/+2 |
| |/ / |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-04 | 49 | -91/+62 |
* | | | Merge pull request #2034 from owncloud/fix_bug47 | Michael Gapczynski | 2013-03-03 | 1 | -18/+19 |
|\ \ \ | |/ / |/| | | |||||
| * | | fix oc#47 | Georg Ehrke | 2013-03-01 | 1 | -18/+19 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-03 | 20 | -34/+86 |
* | | | Fix quoting of query for user_ldap ref #1983 | Brice Maron | 2013-03-02 | 1 | -3/+3 |
* | | | Remove uneeded sanitizeHTML | Lukas Reschke | 2013-03-02 | 1 | -1/+1 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-02 | 5 | -3/+15 |
* | | | Merge branch 'master' into from-insane-autoescape-to-p | Thomas Mueller | 2013-03-01 | 67 | -24/+103 |
|\ \ \ | |||||
| * | | | fixes #2001 - in case the user has no permissions to upload/create files/fold... | Thomas Mueller | 2013-03-01 | 1 | -1/+2 |
| * | | | Merge pull request #2005 from owncloud/trash_add_signals | Bernhard Posselt | 2013-03-01 | 1 | -0/+6 |
| |\ \ \ | |||||
| | * | | | add additional parameter to signal | Björn Schießle | 2013-03-01 | 1 | -2/+6 |
| | * | | | add post_moveToTrash and post_restore signals to the trash bin | Björn Schießle | 2013-03-01 | 1 | -0/+2 |
| * | | | | fix getVersions() call for the history view | Björn Schießle | 2013-03-01 | 1 | -1/+2 |
| * | | | | make sure that the version app always work on the users real home folder and ... | Björn Schießle | 2013-03-01 | 1 | -7/+8 |
| |/ / / | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-01 | 62 | -15/+85 |
| * | | | Merge pull request #1979 from maelzx/patch-2 | Lukas Reschke | 2013-02-28 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Fix window.location mistakes in previous code | maelzx | 2013-02-28 | 1 | -1/+1 |
* | | | | | Sed was wrong | Lukas Reschke | 2013-02-28 | 1 | -1/+1 |
* | | | | | Merge master | Lukas Reschke | 2013-02-28 | 79 | -323/+100 |
|\| | | | |