Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20269 from owncloud/capabilities-webdav-ng-sync | Thomas Müller | 2015-11-03 | 1 | -1/+2 |
|\ | |||||
| * | Add a new core capability which tells the clients which url to use | Thomas Müller | 2015-11-03 | 1 | -1/+2 |
* | | Merge pull request #20223 from owncloud/fix-apply-webdav-tags | Thomas Müller | 2015-11-03 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Fix TagList namespace in property map | Vincent Petry | 2015-11-02 | 1 | -1/+1 |
* | | Merge pull request #20201 from owncloud/checkboxes-groups-enable | Thomas Müller | 2015-11-03 | 2 | -18/+10 |
|\ \ | |||||
| * \ | Merge branch 'master' into checkboxes-groups-enable | Raghu Nayyar | 2015-11-02 | 30 | -10/+90 |
| |\ \ | |||||
| * | | | new checkbox style in app settings | Hendrik Leppelsack | 2015-10-31 | 2 | -18/+10 |
* | | | | Merge pull request #20253 from owncloud/external-storage-wording | Thomas Müller | 2015-11-03 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | fix external storage wording detail, ref #19858 | Jan-Christoph Borchardt | 2015-11-03 | 1 | -1/+1 |
* | | | | | Merge pull request #20256 from owncloud/fix-searchbox-iceweasel | Morris Jobke | 2015-11-03 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | don't validate searchbox | Hendrik Leppelsack | 2015-11-03 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-03 | 12 | -6/+40 |
* | | | | Merge pull request #20232 from owncloud/error-button-color | Thomas Müller | 2015-11-02 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | fix button text color | Jan-Christoph Borchardt | 2015-11-02 | 1 | -0/+3 |
| |/ / / | |||||
* | | | | Merge pull request #20045 from owncloud/dbal-2.5.2 | Thomas Müller | 2015-11-02 | 1 | -0/+0 |
|\ \ \ \ | |||||
| * | | | | Bump 3rdparty for dbal-2.5.2 | Roeland Jago Douma | 2015-11-02 | 1 | -0/+0 |
|/ / / / | |||||
* | | | | Merge pull request #20196 from owncloud/use-actual-mimetype-detection-instead... | Thomas Müller | 2015-11-02 | 1 | -9/+9 |
|\ \ \ \ | |||||
| * | | | | Use actual mimetype detection instead of extension | Lukas Reschke | 2015-10-31 | 1 | -9/+9 |
* | | | | | Merge pull request #20191 from owncloud/fix-20151 | Thomas Müller | 2015-11-02 | 5 | -3/+167 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Merge branch 'master' into fix-20151 | blizzz | 2015-11-02 | 62 | -28/+248 |
| |\ \ \ \ | |||||
| * | | | | | add method to count users by loginname and use it for diagnose test, fixes #2... | Arthur Schiwon | 2015-10-30 | 5 | -3/+167 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #20220 from owncloud/keep-search-open | Thomas Müller | 2015-11-02 | 2 | -2/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | keep searchbox open if it is in action | Hendrik Leppelsack | 2015-11-02 | 2 | -2/+3 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #20192 from owncloud/fix-20090 | Thomas Müller | 2015-11-02 | 2 | -0/+12 |
|\ \ \ \ | |||||
| * | | | | if a user that is flag as deleted shows up again, remove that flag. Fixes #20090 | Arthur Schiwon | 2015-10-30 | 2 | -0/+12 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #20219 from owncloud/issue-19707-scrollto-in-trashibn | Thomas Müller | 2015-11-02 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Fix scrollto= parameter in trashbin view | Joas Schilling | 2015-11-02 | 1 | -1/+3 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #20215 from owncloud/issue-20178-close-user-menu-on-reclick | Thomas Müller | 2015-11-02 | 3 | -4/+3 |
|\ \ \ \ | |||||
| * | | | | Close the user menu when clicking it again | Joas Schilling | 2015-11-02 | 3 | -4/+3 |
| |/ / / | |||||
* | | | | Merge pull request #20181 from owncloud/files-fixdownloadspinner | Thomas Müller | 2015-11-02 | 4 | -3/+101 |
|\ \ \ \ | |||||
| * | | | | Fix file action download spinner | Vincent Petry | 2015-10-30 | 4 | -3/+101 |
* | | | | | Merge pull request #20189 from owncloud/use-get-http-protocol | Thomas Müller | 2015-11-02 | 3 | -6/+6 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Use getHttpProtocol instead of $_SERVER | Lukas Reschke | 2015-10-30 | 3 | -6/+6 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-02 | 14 | -10/+38 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-01 | 16 | -0/+52 |
| |_|/ |/| | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-31 | 18 | -4/+24 |
* | | | Merge pull request #19940 from owncloud/ldap-server-wizard-tooltip | Thomas Müller | 2015-10-31 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | add tooltip to ldap server wizard | Hendrik Leppelsack | 2015-10-29 | 1 | -0/+1 |
* | | | | Merge pull request #20193 from owncloud/redis-password | Thomas Müller | 2015-10-30 | 2 | -0/+8 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Add support for Redis password auth | Lukas Reschke | 2015-10-30 | 2 | -0/+8 |
|/ / / | |||||
* | | | Merge pull request #20175 from owncloud/login-arrow | Thomas Müller | 2015-10-30 | 7 | -39/+0 |
|\ \ \ | |||||
| * | | | remove unneeded icons from input fields to not distract from submit button, f... | Jan-Christoph Borchardt | 2015-10-30 | 7 | -39/+0 |
* | | | | Merge pull request #20169 from RealRancor/fix_contributing_links | Thomas Müller | 2015-10-30 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fix repo links in CONTRIBUTING.md | RealRancor | 2015-10-30 | 1 | -2/+2 |
* | | | | | Merge pull request #20171 from owncloud/tags.js-remove-unneeded-vars | Thomas Müller | 2015-10-30 | 1 | -9/+0 |
|\ \ \ \ \ | |||||
| * | | | | | [tags] remove unneeded variables | Morris Jobke | 2015-10-30 | 1 | -9/+0 |
| |/ / / / | |||||
* | | | | | Merge pull request #20160 from owncloud/share-allowdeleteinshareoverview | Thomas Müller | 2015-10-30 | 2 | -27/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Bring back delete permission in share overview | Vincent Petry | 2015-10-29 | 2 | -27/+11 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #20167 from owncloud/fix-docker-ip-retrieval | Thomas Müller | 2015-10-30 | 6 | -8/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Use proper statement to retrieve the IP of an docker instance | Morris Jobke | 2015-10-30 | 6 | -8/+8 |
| | |/ / / | |/| | | |