summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20702 from owncloud/move-user-principal-into-subfolderThomas Müller2015-11-2612-101/+123
|\ | | | | Users are available under it's own principal resource named 'principa…
| * Fix principal collection for CavDAVTesterThomas Müller2015-11-262-3/+3
| |
| * Introduce \OCP\IUser::getEMailAddress()Thomas Müller2015-11-255-40/+45
| |
| * Users are available under it's own principal resource named ↵Thomas Müller2015-11-258-65/+82
| | | | | | | | 'principals/users' this will allow us to introduce e.g. groups as principals (one day) and system specific principals (needed for federation)
* | Merge pull request #20752 from owncloud/assetic-1.3.2Thomas Müller2015-11-261-0/+0
|\ \ | | | | | | [3rdparty] Bump assetic to 1.3.2
| * | [3rdparty] Bump assetic to 1.3.2Roeland Jago Douma2015-11-261-0/+0
| | |
* | | Merge pull request #20393 from owncloud/querybuilder-select-with-aliasThomas Müller2015-11-263-34/+158
|\ \ \ | |/ / |/| | Add a method to select a field or value with alias
| * | Add a method to select a field or value with aliasJoas Schilling2015-11-233-34/+158
| | |
* | | Merge pull request #20742 from owncloud/symfony_routing-2.7.7Thomas Müller2015-11-261-0/+0
|\ \ \ | | | | | | | | [3rdparty] Bump symfony/routing to 2.7.7
| * | | [3rdparty] Bump symfony/routing to 2.7.7Roeland Jago Douma2015-11-261-0/+0
| | | |
* | | | Merge pull request #20746 from owncloud/untangle-linkToDocsThomas Müller2015-11-265-17/+16
|\ \ \ \ | | | | | | | | | | Untangle the linkToDocs method in OC_Helper
| * | | | Untangle the linkToDocs method in OC_HelperMorris Jobke2015-11-265-17/+16
| |/ / / | | | | | | | | | | | | | | | | * now uses the proper URLGenerator interface * add comment about DI problems
* | | | Merge pull request #20755 from owncloud/integration_test_not_sharee_requestingThomas Müller2015-11-261-0/+10
|\ \ \ \ | | | | | | | | | | Added test case about a user without a share requesting it
| * | | | Added test case about a user without a share requesting itSergio Bertolin2015-11-261-0/+10
| |/ / /
* | | | Merge pull request #20562 from owncloud/comments-interfacesThomas Müller2015-11-264-0/+378
|\ \ \ \ | |/ / / |/| | | public interfaces for Comments
| * | | proper description for IllegalIDChangeExceptionArthur Schiwon2015-11-261-1/+1
| | | |
| * | | missing setters for setChildrenCount and setLatestChildDateTime (formerly ↵Arthur Schiwon2015-11-231-5/+23
| | | | | | | | | | | | | | | | …Timestamp)
| * | | give creation datetime setter and getter a more meaningful and less ↵Arthur Schiwon2015-11-231-5/+5
| | | | | | | | | | | | | | | | misleading name
| * | | public interfaces for CommentsArthur Schiwon2015-11-234-0/+360
| | | |
* | | | Merge pull request #20744 from owncloud/oc_helper-getMimeType-cleanupThomas Müller2015-11-265-38/+3
|\ \ \ \ | | | | | | | | | | Remove last occurences of OC_Helper::getMimeType()
| * | | | remove unused methodMorris Jobke2015-11-261-12/+0
| | | | |
| * | | | Remove last occurences of OC_Helper::getMimeType()Morris Jobke2015-11-264-26/+3
| | | | | | | | | | | | | | | | | | | | * ref #4774
* | | | | Merge pull request #20707 from owncloud/files_external_table_statusThomas Müller2015-11-261-1/+7
|\ \ \ \ \ | | | | | | | | | | | | Fix status icon styling for external storages
| * | | | | Fix status icon styling for external storagesRobin Appelman2015-11-241-1/+7
| | | | | |
* | | | | | Merge pull request #20731 from owncloud/per-storage-updaterThomas Müller2015-11-269-150/+161
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make Cache\Updater per storage
| * | | | | | Make Cache\Updater per storageRobin Appelman2015-11-259-150/+161
| | | | | | |
* | | | | | | Merge pull request #20745 from owncloud/remove-unused-internal-methodsThomas Müller2015-11-263-45/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Remove unused internal methods
| * | | | | | Remove unused internal methodsMorris Jobke2015-11-263-45/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * removes OC_Helper::mb_substr_replace and OC_Helper::mb_str_replace * keeps public interface wrapper working as expected
* | | | | / [tx-robot] updated from transifexJenkins for ownCloud2015-11-2620-6/+108
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #20680 from owncloud/add-dav-sync-supportThomas Müller2015-11-258-14/+1639
|\ \ \ \ \ | | | | | | | | | | | | Adding sync support - including dav tests
| * | | | | Update to sabre dav 3.0.x-devThomas Müller2015-11-251-0/+0
| | | | | |
| * | | | | CardDavBackEnd requires principalBackend on ctorThomas Müller2015-11-252-11/+24
| | | | | |
| * | | | | Use sqliteThomas Müller2015-11-251-1/+3
| | | | | |
| * | | | | Output owncloud.log to the consoleThomas Müller2015-11-251-0/+4
| | | | | |
| * | | | | Adding sync support - including dav testsThomas Müller2015-11-254-2/+1608
|/ / / / /
* | | | | Merge pull request #19212 from owncloud/search-shortcutThomas Müller2015-11-251-0/+12
|\ \ \ \ \ | | | | | | | | | | | | Add Ctrl+F shortcut for the search bar
| * | | | | add search fallback to browserHendrik Leppelsack2015-11-241-1/+6
| | | | | |
| * | | | | add Ctrl+F shortcut for the search barHendrik Leppelsack2015-11-121-0/+7
| | | | | |
* | | | | | Merge pull request #20733 from owncloud/scan-eventsource-no-pathsThomas Müller2015-11-251-8/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dont output paths in scan.php
| * | | | | | Dont output paths in scan.phpRobin Appelman2015-11-251-8/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #20734 from owncloud/federation-iconThomas Müller2015-11-251-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | add icon for Federation app
| * | | | | | add icon for Federation appJan-Christoph Borchardt2015-11-251-0/+4
|/ / / / / /
* | | | | | Merge pull request #20712 from owncloud/replace-netcat-phpThomas Müller2015-11-258-81/+71
|\ \ \ \ \ \ | | | | | | | | | | | | | | Replace shitty netcat use with dedicated PHP script
| * | | | | | Replace shitty netcat use with dedicated PHP scriptRobin McCorkell2015-11-248-81/+71
| | | | | | |
* | | | | | | Merge pull request #20728 from owncloud/symfony_event-dispatcherThomas Müller2015-11-251-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [3rdparty] Bump symfony/event-dispatcher to 2.7.7
| * | | | | | | [3rdparty] Bump symfony/event-dispatcher to 2.7.7Roeland Jago Douma2015-11-251-0/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #20730 from owncloud/fix-errorpage-buttonThomas Müller2015-11-252-5/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix details on redirect and update page
| * | | | | | | update page: fix heading whitespace and unbold less important sectionsJan-Christoph Borchardt2015-11-252-5/+4
| | | | | | | |
| * | | | | | | fix error page button text when label too longJan-Christoph Borchardt2015-11-251-0/+2
| | | | | | | |
* | | | | | | | Merge pull request #20703 from owncloud/share2.0_fileowner_columnThomas Müller2015-11-252-1/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [Sharing 2.0] Add a new db column for the file owner
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-19 17:01:08 +0000