aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23768 from owncloud/skjnldsv-color-generator-editJohn Molakvoæ2016-04-071-5/+23
|\ | | | | Updated color generator
| * Updated color generatorJohn Molakvoæ2016-04-061-5/+23
|/ | | | Separated the main function to allow special use without dom manipulation.
* Merge pull request #23766 from owncloud/replace-getid-3Lukas Reschke2016-04-062-6/+10
|\ | | | | Replace getid3 with ID3Parser
| * Replace getid3 with ID3ParserLukas Reschke2016-04-062-6/+10
| |
* | Merge pull request #23822 from stweil/masterThomas Müller2016-04-068-11/+11
|\ \ | | | | | | tests: Fix typos (found by codespell)
| * | tests: Fix typos (found by codespell)Stefan Weil2016-04-068-11/+11
|/ / | | | | | | | | | | Fix also a small grammar issue. Signed-off-by: Stefan Weil <sw@weilnetz.de>
* | Merge pull request #23501 from owncloud/alarms_for_birthdayeventsThomas Müller2016-04-061-0/+5
|\ \ | | | | | | add VALARM for birthday events
| * \ Merge branch 'master' into alarms_for_birthdayeventsAchim Königs2016-03-26416-1162/+1320
| |\ \
| * | | add VALARM for birthday eventsAchim Königs2016-03-231-0/+5
| | | | | | | | | | | | | | | | ACTION=DISPLAY *should* prevents audible alarms.
* | | | Merge pull request #23823 from owncloud/drop-js-based-acceptance-testsThomas Müller2016-04-0630-2344/+0
|\ \ \ \ | | | | | | | | | | Drop JS based acceptance tests - we have our behat based integration …
| * | | | Drop JS based acceptance tests - we have our behat based integration tests ↵Thomas Müller2016-04-0630-2344/+0
| | | | | | | | | | | | | | | | | | | | which are activly maintained
* | | | | Merge pull request #23819 from owncloud/move-core-completely-to-psr4Roeland Douma2016-04-0660-4/+2
|\ \ \ \ \ | | | | | | | | | | | | Move OC/Core completely to PSR-4
| * | | | | Remove OC/Core autoloading from old autoloaderLukas Reschke2016-04-062-4/+2
| | | | | |
| * | | | | Rename files to be PSR-4 compliantLukas Reschke2016-04-0658-0/+0
| | |_|_|/ | |/| | |
* | | | | Merge pull request #23820 from owncloud/move-settings-completely-to-psr4Roeland Douma2016-04-0613-4/+2
|\ \ \ \ \ | | | | | | | | | | | | Move OC/Settings completely to PSR-4
| * | | | | Remove OC/Settings from old autoloaderLukas Reschke2016-04-062-4/+2
| | | | | |
| * | | | | Rename files to be PSR-4 compliantLukas Reschke2016-04-0611-0/+0
| |/ / / /
* | | | | Merge pull request #23777 from owncloud/ldap-null-userLukas Reschke2016-04-061-5/+7
|\ \ \ \ \ | | | | | | | | | | | | Handle case where the user is not known
| * | | | | Handle case where the user is not known - fixes #23759Thomas Müller2016-04-041-5/+7
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-066-0/+12
| |_|/ / / |/| | | |
* | | | | Merge pull request #23818 from owncloud/use-proper-methodsJoas Schilling2016-04-067-11/+11
|\ \ \ \ \ | |_|/ / / |/| | | | Use proper shortcut methods in templates
| * | | | Use proper shortcut methods in templatesMorris Jobke2016-04-067-11/+11
|/ / / /
* | | | Merge pull request #23763 from owncloud/do_not_export_share_type_2Morris Jobke2016-04-061-2/+0
|\ \ \ \ | | | | | | | | | | Share type 2 is private
| * | | | Share type 2 is privateRoeland Jago Douma2016-04-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added to the factory for legacy reasons when converting from old to new sharing code. It is not used anymore so can be deleted. Which means we no longer expose internal types.
* | | | | Merge pull request #23793 from owncloud/hard-code-dav-endpointsThomas Müller2016-04-062-12/+22
|\ \ \ \ \ | | | | | | | | | | | | All webdav endpoints within remote.php are now hardcoded - helps to p…
| * | | | | All webdav endpoints within remote.php are now hardcoded - helps to prevent ↵Thomas Müller2016-04-052-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | migration issues like #23610 - furthermore there is no need to dynamically lookup all the endpoints we already know
* | | | | | Merge pull request #23808 from owncloud/test-lock-with-strange-filenameRoeland Douma2016-04-061-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Test locking with strange filename
| * | | | | | Test locking with strange filenameJörn Friedrich Dreyer2016-04-051-0/+2
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-06178-526/+84
| | | | | | |
* | | | | | | Merge pull request #23811 from owncloud/move-settings-and-oc-core-to-composerThomas Müller2016-04-055-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add OC\Core and OC\Settings to composer autoloader
| * | | | | | | Move OC\Core and OC\Settings to composer autoloaderLukas Reschke2016-04-055-1/+5
| |/ / / / / /
* | | | | | | Merge pull request #23794 from owncloud/handle-null-in-usermanagerThomas Müller2016-04-052-10/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Prevent null to be passed into the closure of callForAllUsers
| * | | | | | Prevent null to be passed into the closure of callForAllUsersThomas Müller2016-04-052-10/+14
| | | | | | |
* | | | | | | Merge pull request #23040 from owncloud/mobile-css-loadingThomas Müller2016-04-051-6/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | load mobile styles last, fix #19596
| * | | | | | load mobile styles last, fix #19596Jan-Christoph Borchardt2016-04-051-6/+6
| |/ / / / /
* | | | | | Merge pull request #23791 from owncloud/fix-swift-test-mkfifoThomas Müller2016-04-052-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove any stray socket files before creating new ones
| * | | | | Remove any stray socket files before creating new onesRobin McCorkell2016-04-052-0/+2
| | | | | |
* | | | | | Merge pull request #23677 from owncloud/db-schema-migration-feedbackThomas Müller2016-04-058-39/+198
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Show individual sql schema migration steps during upgrade - on web as…
| * | | | | Fix verbose output of upgrade command - not progressbar in this case and the ↵Thomas Müller2016-04-043-19/+45
| | | | | | | | | | | | | | | | | | | | | | | | schema migration test has one progressbar now for all tables - before we had one progressbar for each table
| * | | | | Add detailed logs hidden and show them on requestMorris Jobke2016-04-044-10/+42
| | | | | |
| * | | | | Limit the message to the console to the first 30 characters in order to not ↵Thomas Müller2016-04-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | break the progress bar
| * | | | | Show individual sql schema migration steps during upgrade - on web as well ↵Thomas Müller2016-04-048-31/+128
| | | | | | | | | | | | | | | | | | | | | | | | as on the command line
* | | | | | Merge pull request #23767 from owncloud/remove-unrequired-randomlibThomas Müller2016-04-051-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unrequired randomlib
| * | | | | | Remove unrequired randomlibLukas Reschke2016-04-041-0/+0
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-0584-160/+10
| | | | | | |
* | | | | | | Merge pull request #23682 from owncloud/group_sharing_disabled_capabilityMorris Jobke2016-04-044-0/+51
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Add capability to show if group sharing is enabled
| * | | | | | Add intergration testsRoeland Jago Douma2016-04-042-0/+31
| | | | | | |
| * | | | | | Add capability to show if group sharing is enabledRoeland Jago Douma2016-04-042-0/+20
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #23477 Now clients can correct wording to properly reflect who a user can share with.
* / / / / / Fix PHP memory leak in file_get_contents()Morris Jobke2016-04-042-2/+9
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ref https://bugs.php.net/bug.php?id=61961 * ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256 * code is based on the proposal of @chriseqipe * fixes #20261
* | | | | Merge pull request #23557 from owncloud/sabre-plugin-browser-error-pageThomas Müller2016-04-048-3/+229
|\ \ \ \ \ | |/ / / / |/| | | | In case of exception we return an html page in case the client is a b…
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 12:27:35 +0000