summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-2484-158/+6
|
* Merge pull request #20679 from owncloud/fixphpdocThomas Müller2015-11-231-1/+1
|\ | | | | p() supports string as argument
| * p() supports string as argumentMorris Jobke2015-11-231-1/+1
| |
* | Merge pull request #20617 from owncloud/fix-usage-of-lastInsertIdThomas Müller2015-11-233-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üller2015-11-232-2/+4
| | | | | | | | | | | | Oracle adapter
| * | lastInsertId() is properly working with Oracle if the table name is properly ↵Thomas Müller2015-11-231-16/+1
| |/ | | | | | | passed in
* | Merge pull request #20543 from owncloud/share2.0_fix_hooksThomas Müller2015-11-233-49/+93
|\ \ | | | | | | Move hook and delete children logic to share manager
| * | [Sharing 2.0] Move hook and delete children logic to share managerRoeland Jago Douma2015-11-233-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 timestampJoas Schilling2015-11-232-22/+23
|/
* Merge pull request #16902 from owncloud/jsocclientThomas Müller2015-11-232-3/+13
|\ | | | | Web UI uses Webdav instead of ajax/* calls
| * also match ie11 with Request::USER_AGENT_IERobin Appelman2015-11-221-1/+1
| |
| * Now using IE8 workaround of davclient.js for all IE versionsVincent Petry2015-11-221-2/+2
| |
| * Fix undefined HTTP_USER_AGENTThomas Müller2015-11-221-0/+3
| |
| * Add evert's davclient.js + es6-promise + IE8 workaroundVincent Petry2015-11-221-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-errorThomas Müller2015-11-231-6/+3
|\ \ | | | | | | assume pgsql >=9 if checking the version fails
| * | assume pgsql >=9 if checking the version failsRobin Appelman2015-11-161-6/+3
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-232-0/+4
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-224-0/+14
| |
* | Merge pull request #20614 from ↵Thomas Müller2015-11-207-14/+27
|\ \ | | | | | | | | | | | | owncloud/use-mocks-when-testing-isSharingDisabledForUser Use mocks when testing isSharingDisabledForUser
| * | Adjust PHPDoc as suggestedThomas Müller2015-11-203-3/+3
| | |
| * | Fix failing unit test :skull:Thomas Müller2015-11-191-1/+1
| | |
| * | Use mocks when testing isSharingDisabledForUserThomas Müller2015-11-195-11/+24
| | |
* | | Merge pull request #20034 from owncloud/icewind_streams_0.3.0Thomas Müller2015-11-191-0/+9
|\ \ \ | | | | | | | | Bump 3rdparty for icewind/streams-0.3.0
| * | | Follow the interface againRoeland Jago Douma2015-11-191-0/+9
| |/ /
* | | Adjust the method name to reflect it's behaviourJoas Schilling2015-11-191-1/+1
| | |
* | | Merge pull request #20563 from owncloud/systemtags-interfaceThomas Müller2015-11-195-0/+352
|\ \ \ | |/ / |/| | Core interfaces for system tags and its manager
| * | Core interfaces for system tags and its managerVincent Petry2015-11-195-0/+352
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-194-2/+26
| | |
* | | Handle non existing users as owner in the viewRobin Appelman2015-11-181-5/+20
| | |
* | | Merge pull request #20438 from owncloud/memcache-key-length-fixThomas Müller2015-11-181-8/+30
|\ \ \ | | | | | | | | Handle errors on memcached level
| * | | Handle errors on memcached level - fixes #17397Thomas Müller2015-11-101-8/+30
| | | |
* | | | Merge pull request #20540 from owncloud/fix-format-call-in-loggerThomas Müller2015-11-181-2/+5
|\ \ \ \ | | | | | | | | | | Try to fix logging errors we did observe on ci ....
| * | | | fixes #20538Thomas Müller2015-11-161-2/+5
| | |/ / | |/| |
* | | | Merge pull request #20494 from owncloud/storage-forbidden-exceptionThomas Müller2015-11-184-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 informationJoas Schilling2015-11-174-0/+64
| | | | |
* | | | | Merge pull request #20551 from owncloud/notification-fix-testsThomas Müller2015-11-182-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 methodJoas Schilling2015-11-172-1/+4
| |/ / / /
* | | | | Merge pull request #20188 from owncloud/webdav-exposeshareownerThomas Müller2015-11-172-0/+14
|\ \ \ \ \ | | | | | | | | | | | | Expose share owner id and display name via files webdav
| * | | | | Add getOwner() method to FileInfo and Node APIVincent Petry2015-11-132-0/+14
| | |_|_|/ | |/| | |
* | | | | Merge pull request #20544 from owncloud/move-index-to-appframeworkThomas Müller2015-11-171-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | | Move index.php from files to AppFramework
| * | | | Move index.php from files to AppFrameworkLukas Reschke2015-11-161-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-adjustmentThomas Müller2015-11-174-72/+61
|\ \ \ \ | |/ / / |/| | | Notification api update
| * | | Remove the icon for nowJoas Schilling2015-11-164-72/+0
| | | |
| * | | Add "is primary action" to actionsJoas Schilling2015-11-163-0/+61
| |/ /
* | | Merge pull request #20465 from owncloud/forms.cssThomas Müller2015-11-161-0/+1
|\ \ \ | | | | | | | | Move form styles from styles.css to inputs.css
| * | | move form styles from styles.css to inputs.cssHendrik Leppelsack2015-11-131-0/+1
| | | |
* | | | [Share2.0] OCS Share API getShare uses new codeRoeland Jago Douma2015-11-163-17/+70
| |/ / |/| |
* | | Merge pull request #20472 from owncloud/switch-ch-log_with_ms_precisionThomas Müller2015-11-121-1/+1
|\ \ \ | | | | | | | | enable microseconds in log timestamps
| * | | enable microseconds in log timestampsChristian Schnidrig2015-11-121-1/+1
| | | |
* | | | Merge pull request #17920 from andyboeh/masterThomas Müller2015-11-121-0/+1
|\ \ \ \ | |/ / / |/| | | Add possibility for alternative logins to force redirection of login page