summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-0116-0/+52
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-3118-4/+24
* Merge pull request #19940 from owncloud/ldap-server-wizard-tooltipThomas Müller2015-10-311-0/+1
|\
| * add tooltip to ldap server wizardHendrik Leppelsack2015-10-291-0/+1
* | Merge pull request #20193 from owncloud/redis-passwordThomas Müller2015-10-302-0/+8
|\ \
| * | Add support for Redis password authLukas Reschke2015-10-302-0/+8
|/ /
* | Merge pull request #20175 from owncloud/login-arrowThomas Müller2015-10-307-39/+0
|\ \
| * | remove unneeded icons from input fields to not distract from submit button, f...Jan-Christoph Borchardt2015-10-307-39/+0
* | | Merge pull request #20169 from RealRancor/fix_contributing_linksThomas Müller2015-10-301-2/+2
|\ \ \
| * | | Fix repo links in CONTRIBUTING.mdRealRancor2015-10-301-2/+2
* | | | Merge pull request #20171 from owncloud/tags.js-remove-unneeded-varsThomas Müller2015-10-301-9/+0
|\ \ \ \
| * | | | [tags] remove unneeded variablesMorris Jobke2015-10-301-9/+0
| |/ / /
* | | | Merge pull request #20160 from owncloud/share-allowdeleteinshareoverviewThomas Müller2015-10-302-27/+11
|\ \ \ \
| * | | | Bring back delete permission in share overviewVincent Petry2015-10-292-27/+11
* | | | | Merge pull request #20167 from owncloud/fix-docker-ip-retrievalThomas Müller2015-10-306-8/+8
|\ \ \ \ \
| * | | | | Use proper statement to retrieve the IP of an docker instanceMorris Jobke2015-10-306-8/+8
| | |/ / / | |/| | |
* | | | | Merge pull request #20170 from owncloud/remove-some-oc_config-callsThomas Müller2015-10-303-6/+7
|\ \ \ \ \
| * | | | | Replace some OC_Config calls with ILogger methodsMorris Jobke2015-10-303-6/+7
| |/ / / /
* | | | | Merge pull request #20156 from owncloud/files-filter-triger-onceRobin Appelman2015-10-301-2/+3
|\ \ \ \ \
| * | | | | dont trigger the scroll event of every single item we filter in the file listRobin Appelman2015-10-291-2/+3
* | | | | | Merge pull request #20149 from owncloud/revert-19797-specify-php-5-4Thomas Müller2015-10-301-10/+0
|\ \ \ \ \ \
| * | | | | | Revert "Specify PHP 5.4 as version for scrutinizer"Lukas Reschke2015-10-291-10/+0
* | | | | | | Merge pull request #20166 from owncloud/error-message-l10n-failureThomas Müller2015-10-301-0/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add warning for broken l10n json filesMorris Jobke2015-10-301-0/+2
|/ / / / / /
* | | | | | Merge pull request #19680 from owncloud/ocs_sharing_api_integration_testingThomas Müller2015-10-305-58/+312
|\ \ \ \ \ \
| * | | | | | Upgrade behat to 3.0.x and use @BeforeScenario and @AfterScenario to clean up...Thomas Müller2015-10-295-39/+43
| * | | | | | added sharing feature fileSergio Bertolin2015-10-292-28/+278
| | |_|/ / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-3042-28/+274
* | | | | | Merge pull request #20051 from otetard/feature/newfilemenu_extendThomas Müller2015-10-291-31/+46
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow apps to add new items in the “New” filemenu.Olivier Tétard2015-10-261-31/+46
* | | | | | Merge pull request #20135 from owncloud/check-if-null-subadminThomas Müller2015-10-2925-1793/+2538
|\ \ \ \ \ \
| * | | | | | Drop OC_SubAdmin and replace usagesLukas Reschke2015-10-2925-1793/+2538
* | | | | | | Merge pull request #20060 from owncloud/cache-move-final-update-transactionRobin Appelman2015-10-291-2/+6
|\ \ \ \ \ \ \
| * | | | | | | include the final update in the transaction when moving a folder in the cacheRobin Appelman2015-10-291-2/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #20152 from owncloud/LukasReschke-patch-1Thomas Müller2015-10-291-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Remove invalid type-castLukas Reschke2015-10-291-4/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #20122 from owncloud/files-consolidateiconupdateThomas Müller2015-10-298-11/+109
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix icon update to be more consistentVincent Petry2015-10-298-11/+109
* | | | | | | Merge pull request #19592 from owncloud/availability-root-always-existsThomas Müller2015-10-291-0/+3
|\ \ \ \ \ \ \
| * | | | | | | The root of a storage always existsRobin Appelman2015-10-291-0/+3
* | | | | | | | Merge pull request #20134 from owncloud/pass-with-skippingThomas Müller2015-10-293-24/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Make Travis CI pass when DAV was not touchedJoas Schilling2015-10-293-24/+27
* | | | | | | | | Merge pull request #20141 from owncloud/checkboxes-settings-usersThomas Müller2015-10-291-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | apply new checkbox style in users settingsHendrik Leppelsack2015-10-291-5/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #20144 from owncloud/gitignore-clover.xmlThomas Müller2015-10-291-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | ignore any clover.xml - which is generated by some phpunit callsThomas Müller2015-10-291-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrenameThomas Müller2015-10-294-3/+74
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix locking unit tests due to filemtime additionVincent Petry2015-10-261-2/+10
| * | | | | | | | Also adjust storage_mtime of target after renameVincent Petry2015-10-263-1/+64
* | | | | | | | | Merge pull request #11509 from owncloud/internal_email_templateThomas Müller2015-10-293-5/+57
|\ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 11:06:40 +0000