Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2096 from owncloud/cache-upgrade-id | Michael Gapczynski | 2013-03-04 | 1 | -4/+5 |
|\ | |||||
| * | Cache: more efficient detection for existing entries during upgrade | Robin Appelman | 2013-03-04 | 1 | -9/+3 |
| * | Cache: also check if the file id is already in the cache during upgrade | Robin Appelman | 2013-03-04 | 1 | -3/+10 |
* | | Merge pull request #2077 from owncloud/oc_filepicker_inline_js | Lukas Reschke | 2013-03-04 | 1 | -4/+6 |
|\ \ | |||||
| * | | Remove inline js from OC.Dialogs.FilePicker. | Thomas Tanghus | 2013-03-04 | 1 | -4/+6 |
* | | | Merge pull request #2092 from owncloud/infieldlabels-placeholder | Lukas Reschke | 2013-03-04 | 4 | -12/+12 |
|\ \ \ | |||||
| * | | | explicitly add empty placeholder to inputs which use infield labels, fix #2049 | Jan-Christoph Borchardt | 2013-03-04 | 4 | -12/+12 |
* | | | | 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 #2088 from owncloud/fixing-1844-again-master | Bernhard Posselt | 2013-03-04 | 3 | -2/+15 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | adding test case for getDefaultEmailAddress() + fixing #1844 again | Thomas Mueller | 2013-03-04 | 3 | -2/+15 |
* | | | | | Merge pull request #2078 from owncloud/save_category_relations | Thomas Müller | 2013-03-04 | 1 | -5/+4 |
|\ \ \ \ \ | |||||
| * | | | | | VCategories: Don't forget to save category relations if category exists. | Thomas Tanghus | 2013-03-04 | 1 | -5/+4 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #2085 from owncloud/csp_shitty-browsers | Lukas Reschke | 2013-03-04 | 1 | -1/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Only send the standard headers | Lukas Reschke | 2013-03-04 | 1 | -1/+0 |
|/ / / / | |||||
* | | | | Merge pull request #2084 from owncloud/fix-group-displaynames | Bernhard Posselt | 2013-03-04 | 2 | -7/+7 |
|\ \ \ \ | |||||
| * | | | | Fix #2074 by initializing as an array | Michael Gapczynski | 2013-03-04 | 2 | -7/+7 |
* | | | | | 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 |
| |/ / / | |||||
* | | | | Merge pull request #2076 from owncloud/filestable-specificity | Bernhard Posselt | 2013-03-04 | 2 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | 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 |
* | | | | Merge pull request #2072 from owncloud/fix_typo | Frank Karlitschek | 2013-03-04 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | 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 |
| |/ / / | |||||
* | | | | Merge pull request #2068 from owncloud/fix_ldap_typo | Lukas Reschke | 2013-03-04 | 2 | -3/+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 |
* | | | | | Merge pull request #2065 from owncloud/files_datepicker | Bart Visscher | 2013-03-04 | 2 | -2/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Datepicker height fixed. | raghunayyar | 2013-03-04 | 2 | -2/+2 |
* | | | | | Merge pull request #2061 from owncloud/app-text | Frank Karlitschek | 2013-03-04 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Add the description as text and not as html | Lukas Reschke | 2013-03-04 | 1 | -1/+1 |