Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-07 | 35 | -383/+429 | |
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #2134 from owncloud/fix_2127 | blizzz | 2013-03-06 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | / / / / / / / / / / | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | return 403 when mkdir failed on webDAV, fixes #2127 | Arthur Schiwon | 2013-03-06 | 1 | -1/+3 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #2130 from owncloud/fix_2128 | Thomas Müller | 2013-03-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | fix #2128 | Georg Ehrke | 2013-03-06 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #2129 from owncloud/don't-sanitize-error-message | Bernhard Posselt | 2013-03-06 | 2 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add warning about sanitization | Lukas Reschke | 2013-03-06 | 1 | -2/+3 | |
| * | | | | | | | | | | | Don't sanitize error message hint | Lukas Reschke | 2013-03-06 | 1 | -1/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #2120 from owncloud/clear-caches | Bernhard Posselt | 2013-03-06 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Clear the CSS and JS cache earlier to make sure update goes smoothly | Michael Gapczynski | 2013-03-05 | 2 | -4/+4 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #2119 from owncloud/fix_ldap_settings | Bernhard Posselt | 2013-03-06 | 2 | -12/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | LDAP: move more settings stuff to template file | Arthur Schiwon | 2013-03-06 | 2 | -12/+15 | |
| * | | | | | | | | | | | LDAP: fix settings output thus make settings work again | Arthur Schiwon | 2013-03-05 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #2118 from owncloud/fix_1689 | Björn Schießle | 2013-03-06 | 4 | -4/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | whitespace | Arthur Schiwon | 2013-03-05 | 1 | -1/+1 | |
| * | | | | | | | | | | | LDAP: implementation of displayNamesInGroup | Arthur Schiwon | 2013-03-05 | 2 | -3/+30 | |
| * | | | | | | | | | | | make getDisplayNames optional feature for Group Backends, fall back to intern... | Arthur Schiwon | 2013-03-05 | 2 | -1/+9 | |
* | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-06 | 61 | -238/+306 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #2112 from owncloud/fix_1673 | Frank Karlitschek | 2013-03-05 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | LDAP: escape some more chars for proper search filter, fixes #1673 | Arthur Schiwon | 2013-03-05 | 1 | -0/+3 | |
| |/ / / / / / / / / / | ||||||
* | / / / / / / / / / | Merge pull request #2108 from owncloud/fix_ldap_errorcheck | Björn Schießle | 2013-03-05 | 1 | -1/+1 | |
|\| | | | | | | | | | | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | LDAP: error codes can be negative, too | Arthur Schiwon | 2013-03-05 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | ownCloud 5 RC2v5.0.0RC2 | Frank Karlitschek | 2013-03-02 | 1 | -2/+2 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-05 | 33 | -100/+161 | |
* | | | | | | | | | 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 | |
| | |/ / / / / / / / / / | |/| | | | | | | | | | |