summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove OC_DB::insertidMorris Jobke2016-01-075-20/+5
|
* Remove beginTransaction, commit, rollback from OC_DBMorris Jobke2016-01-072-24/+3
|
* Remove OC_DB::isErrorMorris Jobke2016-01-073-20/+7
|
* Remove OC_DB::dropTableMorris Jobke2016-01-075-22/+2
|
* Merge pull request #21495 from owncloud/polyfillThomas Müller2016-01-071-0/+0
|\ | | | | [3rdparty] Bump symfony/polyfill-php
| * [3rdparty] Bump symfony/polyfill-phpRoeland Jago Douma2016-01-071-0/+0
| |
* | Merge pull request #21493 from owncloud/fix-repair-pathThomas Müller2016-01-0719-4/+1
|\ \ | | | | | | Move lib/repair to lib/private/repair
| * | Move lib/repair to lib/private/repairMorris Jobke2016-01-0719-4/+1
| | |
* | | Merge pull request #21359 from owncloud/check-changesThomas Müller2016-01-073-7/+2
|\ \ \ | | | | | | | | remove mention of 'filesystem_check_changes' => 2 from the config sample
| * | | fix js unit testsMorris Jobke2016-01-071-2/+2
| | | |
| * | | Also remove it from the web interfaceRobin Appelman2016-01-071-2/+0
| | | |
| * | | remove mention of 'filesystem_check_changes' => 2 from the config sampleRobin Appelman2016-01-071-3/+0
| |/ /
* | | Merge pull request #21503 from owncloud/public-fixdownloadlinktokenLukas Reschke2016-01-072-4/+8
|\ \ \ | |_|/ |/| | Add token in webdav download link of public page
| * | Add token in webdav download link of public pageVincent Petry2016-01-072-4/+8
|/ /
* | Merge pull request #21404 from owncloud/symfony_console_2.8.0Thomas Müller2016-01-071-0/+0
|\ \ | |/ |/| [3rdparty] Bump symfony/console to 2.8.0
| * [3rdparty] Bump symfony/console to 2.8.0Roeland Jago Douma2016-01-011-0/+0
| |
* | Merge pull request #21343 from owncloud/ldap-showremnants-json-outputThomas Müller2016-01-071-11/+15
|\ \ | | | | | | Add an option to occ ldap:showremnants to output a json encoded array…
| * | Add an option to occ ldap:showremnants to output a json encoded array for ↵Stephen Colebrook2015-12-221-11/+15
| | | | | | | | | | | | use in scripts and other tools.
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-07184-2034/+1786
| | |
* | | Merge pull request #20994 from owncloud/personal-pageThomas Müller2016-01-065-102/+149
|\ \ \ | | | | | | | | improve layout of personal settings page
| * | | fix overlap and functionality of cropperJan-Christoph Borchardt2015-12-283-3/+19
| | | |
| * | | improve layout of personal settings pageJan-Christoph Borchardt2015-12-285-103/+134
| | | |
* | | | Merge pull request #21349 from owncloud/web_use_shareeThomas Müller2016-01-062-19/+406
|\ \ \ \ | | | | | | | | | | Webinterface use sharee API
| * | | | Added js tests for the Sharee API usageRoeland Jago Douma2015-12-301-0/+292
| | | | |
| * | | | Fix unit testsRoeland Jago Douma2015-12-302-7/+33
| | | | |
| * | | | Filter out share owner in sharee suggestion listRoeland Jago Douma2015-12-301-0/+9
| | | | |
| * | | | Web sharing uses sharee endpointRoeland Jago Douma2015-12-301-15/+75
| | | | |
* | | | | Merge pull request #21398 from owncloud/sharing-disabled-cacheThomas Müller2016-01-061-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Cache isSharingDisabledForUser
| * | | | | Cache sharing disabled in the viewRobin Appelman2015-12-301-2/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #21443 from owncloud/fix-container-lookupThomas Müller2016-01-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Lookup the App name instead of OCA
| * | | | | Lookup the App name instead of OCAJoas Schilling2016-01-041-1/+1
| | | | | |
* | | | | | Merge pull request #21444 from owncloud/move-regenerate-belowThomas Müller2016-01-068-8/+72
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move regeneration of session ID into session classes
| * | | | | | Assign DB group for unit testsLukas Reschke2016-01-041-0/+4
| | | | | | |
| * | | | | | Move regeneration of session ID into session classesLukas Reschke2016-01-048-8/+68
| |/ / / / / | | | | | | | | | | | | | | | | | | There were code paths that nowadays call ISession::login directly thus bypassing the desired regeneration of the session ID. This moves the session regeneration deeper into the session handling and thus ensures that it is always called. Furthermore, I also added the session regeneration to the remember me cookie plus added some test case expectations for this.
* | | | | | Merge pull request #21459 from owncloud/make-ldap-more-robustThomas Müller2016-01-062-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make LDAP more robust to exceptions and log them properly
| * | | | | | Make LDAP more robust to exceptions and log them properlyMorris Jobke2016-01-062-1/+2
| | | | | | |
* | | | | | | Merge pull request #21469 from owncloud/drop-old-gallery-tableThomas Müller2016-01-061-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Drop oc_gallery_sharing which was removed in 8.0.0
| * | | | | | | Drop oc_gallery_sharing which was removed in 8.0.0Morris Jobke2016-01-061-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | See https://github.com/owncloud/gallery-old/commit/c080dfe87d5eb1de8aa27b1836629b57b0316004
* | | | | | | Merge pull request #21482 from owncloud/htaccess-ico-ruleThomas Müller2016-01-061-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow ico files to be served statically
| * | | | | | | Allow ico files to be served staticallyMorris Jobke2016-01-061-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #21488 from th3fallen/patch-1Thomas Müller2016-01-061-4/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Blacklist myself
| * | | | | | Blacklist myselfClark Tomlinson2016-01-061-4/+12
|/ / / / / / | | | | | | | | | | | | To stop being mentioned endlessly
* | | | | | Merge pull request #21473 from owncloud/fix-unit-tests-because-appstoreJörn Friedrich Dreyer2016-01-065-32/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | Inject OCSClient - Fixes master unit tests
| * | | | | | Inject OCSClientLukas Reschke2016-01-065-32/+38
|/ / / / / / | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/21451
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-0620-30/+56
| | | | | |
* | | | | | Merge pull request #21409 from JohannesKleine/patch-1Jörn Friedrich Dreyer2016-01-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update config.sample.php
| * \ \ \ \ \ Merge branch 'master' into patch-1JohannesKleine2016-01-024-0/+6
| |\ \ \ \ \ \
| * | | | | | | Update config.sample.phpJohannesKleine2015-12-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | I corrected the word order.
* | | | | | | | Merge pull request #21377 from owncloud/login-submit-button-border-2Jörn Friedrich Dreyer2016-01-051-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove unnecessary border from login button
| * | | | | | | | Remove unnecessary border from login buttonChristoph Wurst2015-12-291-0/+2
| | |_|_|/ / / / | |/| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 12:36:37 +0000