Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-24 | 84 | -158/+6 |
| | |||||
* | Merge pull request #20679 from owncloud/fixphpdoc | Thomas Müller | 2015-11-23 | 1 | -1/+1 |
|\ | | | | | p() supports string as argument | ||||
| * | p() supports string as argument | Morris Jobke | 2015-11-23 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #20617 from owncloud/fix-usage-of-lastInsertId | Thomas Müller | 2015-11-23 | 3 | -18/+5 |
|\ \ | | | | | | | lastInsertId() is properly working with Oracle if the table name is p… | ||||
| * | | Throw an exception in case no table name is passed into lastInsertId of the ↵ | Thomas Müller | 2015-11-23 | 2 | -2/+4 |
| | | | | | | | | | | | | Oracle adapter | ||||
| * | | lastInsertId() is properly working with Oracle if the table name is properly ↵ | Thomas Müller | 2015-11-23 | 1 | -16/+1 |
| |/ | | | | | | | passed in | ||||
* | | Merge pull request #20543 from owncloud/share2.0_fix_hooks | Thomas Müller | 2015-11-23 | 3 | -49/+93 |
|\ \ | | | | | | | Move hook and delete children logic to share manager | ||||
| * | | [Sharing 2.0] Move hook and delete children logic to share manager | Roeland Jago Douma | 2015-11-23 | 3 | -49/+93 |
| |/ | | | | | | | | | | | | | To make sure hooks are always fired and child entries are always cleaned. This logic is moved to the share manager. * Updated unit tests | ||||
* / | Use a DateTime object instead of a timestamp | Joas Schilling | 2015-11-23 | 2 | -22/+23 |
|/ | |||||
* | Merge pull request #16902 from owncloud/jsocclient | Thomas Müller | 2015-11-23 | 2 | -3/+13 |
|\ | | | | | Web UI uses Webdav instead of ajax/* calls | ||||
| * | also match ie11 with Request::USER_AGENT_IE | Robin Appelman | 2015-11-22 | 1 | -1/+1 |
| | | |||||
| * | Now using IE8 workaround of davclient.js for all IE versions | Vincent Petry | 2015-11-22 | 1 | -2/+2 |
| | | |||||
| * | Fix undefined HTTP_USER_AGENT | Thomas Müller | 2015-11-22 | 1 | -0/+3 |
| | | |||||
| * | Add evert's davclient.js + es6-promise + IE8 workaround | Vincent Petry | 2015-11-22 | 1 | -2/+9 |
| | | | | | | | | | | | | - Add davclient.js lib - Add es6-promise required by that lib - Wrote IE8 workaround lib/shim for davclient.js | ||||
* | | Merge pull request #20524 from owncloud/pgsql-version-check-error | Thomas Müller | 2015-11-23 | 1 | -6/+3 |
|\ \ | | | | | | | assume pgsql >=9 if checking the version fails | ||||
| * | | assume pgsql >=9 if checking the version fails | Robin Appelman | 2015-11-16 | 1 | -6/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-23 | 2 | -0/+4 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-22 | 4 | -0/+14 |
| | | |||||
* | | Merge pull request #20614 from ↵ | Thomas Müller | 2015-11-20 | 7 | -14/+27 |
|\ \ | | | | | | | | | | | | | owncloud/use-mocks-when-testing-isSharingDisabledForUser Use mocks when testing isSharingDisabledForUser | ||||
| * | | Adjust PHPDoc as suggested | Thomas Müller | 2015-11-20 | 3 | -3/+3 |
| | | | |||||
| * | | Fix failing unit test :skull: | Thomas Müller | 2015-11-19 | 1 | -1/+1 |
| | | | |||||
| * | | Use mocks when testing isSharingDisabledForUser | Thomas Müller | 2015-11-19 | 5 | -11/+24 |
| | | | |||||
* | | | Merge pull request #20034 from owncloud/icewind_streams_0.3.0 | Thomas Müller | 2015-11-19 | 1 | -0/+9 |
|\ \ \ | | | | | | | | | Bump 3rdparty for icewind/streams-0.3.0 | ||||
| * | | | Follow the interface again | Roeland Jago Douma | 2015-11-19 | 1 | -0/+9 |
| |/ / | |||||
* | | | Adjust the method name to reflect it's behaviour | Joas Schilling | 2015-11-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #20563 from owncloud/systemtags-interface | Thomas Müller | 2015-11-19 | 5 | -0/+352 |
|\ \ \ | |/ / |/| | | Core interfaces for system tags and its manager | ||||
| * | | Core interfaces for system tags and its manager | Vincent Petry | 2015-11-19 | 5 | -0/+352 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-19 | 4 | -2/+26 |
| | | | |||||
* | | | Handle non existing users as owner in the view | Robin Appelman | 2015-11-18 | 1 | -5/+20 |
| | | | |||||
* | | | Merge pull request #20438 from owncloud/memcache-key-length-fix | Thomas Müller | 2015-11-18 | 1 | -8/+30 |
|\ \ \ | | | | | | | | | Handle errors on memcached level | ||||
| * | | | Handle errors on memcached level - fixes #17397 | Thomas Müller | 2015-11-10 | 1 | -8/+30 |
| | | | | |||||
* | | | | Merge pull request #20540 from owncloud/fix-format-call-in-logger | Thomas Müller | 2015-11-18 | 1 | -2/+5 |
|\ \ \ \ | | | | | | | | | | | Try to fix logging errors we did observe on ci .... | ||||
| * | | | | fixes #20538 | Thomas Müller | 2015-11-16 | 1 | -2/+5 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #20494 from owncloud/storage-forbidden-exception | Thomas Müller | 2015-11-18 | 4 | -0/+64 |
|\ \ \ \ | | | | | | | | | | | Allow storage wrappers to through a forbidden exception with retry information for clients | ||||
| * | | | | Allow storage wrappers to through a forbidden exception with retry information | Joas Schilling | 2015-11-17 | 4 | -0/+64 |
| | | | | | |||||
* | | | | | Merge pull request #20551 from owncloud/notification-fix-tests | Thomas Müller | 2015-11-18 | 2 | -1/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Notification - Add tests for the "return $this" and fix it on the new method | ||||
| * | | | | | Add tests for the "return $this" and fix it on the new method | Joas Schilling | 2015-11-17 | 2 | -1/+4 |
| |/ / / / | |||||
* | | | | | Merge pull request #20188 from owncloud/webdav-exposeshareowner | Thomas Müller | 2015-11-17 | 2 | -0/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | Expose share owner id and display name via files webdav | ||||
| * | | | | | Add getOwner() method to FileInfo and Node API | Vincent Petry | 2015-11-13 | 2 | -0/+14 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #20544 from owncloud/move-index-to-appframework | Thomas Müller | 2015-11-17 | 1 | -0/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Move index.php from files to AppFramework | ||||
| * | | | | Move index.php from files to AppFramework | Lukas Reschke | 2015-11-16 | 1 | -0/+4 |
| | |/ / | |/| | | | | | | | | | | | | | | 1. Allows it to use the more secure CSP rules of the AppFramework. 2. Adds some unit tests. | ||||
* | | | | Merge pull request #20539 from owncloud/notification-api-adjustment | Thomas Müller | 2015-11-17 | 4 | -72/+61 |
|\ \ \ \ | |/ / / |/| | | | Notification api update | ||||
| * | | | Remove the icon for now | Joas Schilling | 2015-11-16 | 4 | -72/+0 |
| | | | | |||||
| * | | | Add "is primary action" to actions | Joas Schilling | 2015-11-16 | 3 | -0/+61 |
| |/ / | |||||
* | | | Merge pull request #20465 from owncloud/forms.css | Thomas Müller | 2015-11-16 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Move form styles from styles.css to inputs.css | ||||
| * | | | move form styles from styles.css to inputs.css | Hendrik Leppelsack | 2015-11-13 | 1 | -0/+1 |
| | | | | |||||
* | | | | [Share2.0] OCS Share API getShare uses new code | Roeland Jago Douma | 2015-11-16 | 3 | -17/+70 |
| |/ / |/| | | |||||
* | | | Merge pull request #20472 from owncloud/switch-ch-log_with_ms_precision | Thomas Müller | 2015-11-12 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | enable microseconds in log timestamps | ||||
| * | | | enable microseconds in log timestamps | Christian Schnidrig | 2015-11-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #17920 from andyboeh/master | Thomas Müller | 2015-11-12 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | Add possibility for alternative logins to force redirection of login page |