Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix svg of calendar filetype icon | Jan-Christoph Borchardt | 2014-09-11 | 2 | -34/+32 |
| | |||||
* | fix size of toggle icon, make container square | Jan-Christoph Borchardt | 2014-09-11 | 2 | -4/+1 |
| | |||||
* | improve style of checkmark icon, less bold, fitting ownCloud style | Jan-Christoph Borchardt | 2014-09-11 | 2 | -3/+1 |
| | |||||
* | Merge pull request #11006 from ↵ | Thomas Müller | 2014-09-11 | 1 | -2/+18 |
|\ | | | | | | | | | owncloud/addCustomHex2BinImplementationBecauseSupporting53IsSomethingReallyReallyCoolAndWeAreObviouslySomeOfTheCoolGuys Add custom hex2bin implementation for 5.3 | ||||
| * | Add custom hex2bin implementation for 5.3 | Lukas Reschke | 2014-09-11 | 1 | -2/+18 |
| | | | | | | | | Fixes https://github.com/owncloud/core/issues/11004 | ||||
* | | Merge pull request #11007 from owncloud/replaces-10850 | Thomas Müller | 2014-09-11 | 3 | -1/+3 |
|\ \ | | | | | | | Add X-UA-Compatible to all templates | ||||
| * | | Add X-UA-Compatible to all templates | Lukas Reschke | 2014-09-11 | 3 | -1/+3 |
| | | | | | | | | | | | | Replaces https://github.com/owncloud/core/pull/10850 | ||||
* | | | Merge pull request #3937 from owncloud/refresh_if_maintenance_is_over | Lukas Reschke | 2014-09-11 | 4 | -2/+25 |
|\ \ \ | |/ / |/| | | Refresh if maintenance mode is over | ||||
| * | | Refresh if maintenance mode is over | kondou | 2014-09-09 | 4 | -2/+25 |
| | | | | | | | | | | | | | | | | | | | | | Using status.php for this. I modified status.php to also show, whether we're in maintenance. Checks every 20 seconds if maintenance is over, if yes: reload. | ||||
* | | | Merge pull request #10962 from owncloud/repair_search_lucene | Lukas Reschke | 2014-09-11 | 3 | -2/+66 |
|\ \ \ | |_|/ |/| | | repair search lucene before installing | ||||
| * | | repair search lucene before installing | Jörn Friedrich Dreyer | 2014-09-10 | 3 | -2/+66 |
| |/ | |||||
* | | Merge pull request #9698 from owncloud/fix-9666 | Thomas Müller | 2014-09-11 | 3 | -6/+8 |
|\ \ | | | | | | | Load apps in tests, fixes #9666 | ||||
| * | | Fix contructor in test | Robin Appelman | 2014-09-10 | 1 | -3/+3 |
| | | | |||||
| * | | Fix mkdir error in mountconfig.php | Robin McCorkell | 2014-09-10 | 1 | -1/+1 |
| | | | |||||
| * | | Load apps in test situations | Robin McCorkell | 2014-09-10 | 2 | -2/+4 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-11 | 28 | -151/+774 |
| | | | |||||
* | | | Merge pull request #10992 from oparoz/patch-3 | Robin McCorkell | 2014-09-10 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | Create .user.ini for PHP-FPM | ||||
| * | | Create .user.ini for PHP-FPM | Olivier Paroz | 2014-09-10 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | PHP-FPM can't read .htaccess PHP settings unless a PECL extension is installed. From version 5.3+ of PHP, settings can be set in .user.ini files This is a .user.ini file mirroring what is included in the .htaccess file TODO: Update the documentation if there are sections documenting how to change some PHP limits | ||||
* | | | Merge pull request #10988 from owncloud/usetransactions-wrong-name | Thomas Müller | 2014-09-10 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Fix method name useTransactions | ||||
| * | | Fix method name | Robin Appelman | 2014-09-10 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #10990 from owncloud/fix-testCallRegister-master | Lukas Reschke | 2014-09-10 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | requesttoken has now a length of 30 chars | ||||
| * | | | requesttoken has now a length of 30 chars | Thomas Müller | 2014-09-10 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #10929 from owncloud/issue/10514 | Vincent Petry | 2014-09-10 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Set overwritewebroot when installing owncloud to avoid problems | ||||
| * | | Set overwritewebroot when installing owncloud to avoid problems | Joas Schilling | 2014-09-08 | 1 | -0/+1 |
| | | | | | | | | | | | | Fix #10514 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-10 | 39 | -41/+89 |
| | | | |||||
* | | | Merge pull request #9512 from libasys/patch-2 | Lukas Reschke | 2014-09-09 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | Fix use Sharing Api with calendar | ||||
| * | | | Fix use Sharing Api with calendar | libasys | 2014-07-08 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | Without this fix it logs this error: Undefined index: itemSourceName at /opt/local/apache2/htdocs/oc7/core/ajax/share.php#44 I think the itemSourceName is only used with sharing files! | ||||
* | | | | Merge pull request #10844 from owncloud/acceptance-enableapps | Lukas Reschke | 2014-09-09 | 4 | -9/+304 |
|\ \ \ \ | | | | | | | | | | | Added acceptance tests for enabling apps | ||||
| * | | | | Added acceptance tests for enabling apps | Vincent Petry | 2014-09-03 | 4 | -9/+304 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tests whether a user can see navigation entries after enabling apps. This includes the app's group restriction. This currently expects that a group "group1" exists until we have code to auto-generate groups. This commit also provides a utility function Page.multiselectSetSelection() to make it possible to select entries inside a multiselect. | ||||
* | | | | | Merge pull request #10972 from ppaysant/routes-defaults | Bernhard Posselt | 2014-09-09 | 2 | -4/+28 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow default values for route parameters. | ||||
| * | | | | | Allow default values for route parameters. | Patrick Paysant | 2014-09-09 | 2 | -4/+28 |
| | | | | | | |||||
* | | | | | | Merge pull request #10922 from owncloud/explicit-scan-transactions | Lukas Reschke | 2014-09-09 | 5 | -6/+35 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Use bigger transactions when doing explicit file system scans | ||||
| * | | | | | Fix typo | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Use bigger transactions when doing explicit file system scans | Robin Appelman | 2014-09-08 | 5 | -6/+35 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #10969 from owncloud/set-e | Vincent Petry | 2014-09-09 | 2 | -0/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | terminate script execution in case of failure | ||||
| * | | | | | terminate script execution in case of failure | Thomas Müller | 2014-09-09 | 2 | -0/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #10964 from owncloud/static-array-functions | Bernhard Posselt | 2014-09-09 | 1 | -7/+29 |
|\ \ \ \ \ | |/ / / / |/| | | | | More sugar for including lists of files in templates | ||||
| * | | | | more sugar for including lists of templates | Bernhard Posselt | 2014-09-09 | 1 | -7/+29 |
|/ / / / | |||||
* | | | | Merge pull request #10948 from owncloud/fix-zindex | Lukas Reschke | 2014-09-09 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | fix z-index of header and dropdowns, fix user menu not showing on mobile | ||||
| * | | | | fix z-index of header and dropdowns, fix user menu not showing on mobile | Jan-Christoph Borchardt | 2014-09-08 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge pull request #10947 from owncloud/html-imports | Bernhard Posselt | 2014-09-09 | 1 | -0/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | add template functions for html imports | ||||
| * | | | | | append .html since componets always use html files | Bernhard Posselt | 2014-09-08 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | add template functions for html imports | Bernhard Posselt | 2014-09-08 | 1 | -0/+10 |
| | | | | | | |||||
* | | | | | | Merge pull request #9753 from owncloud/filepath-css | Thomas Müller | 2014-09-09 | 2 | -1/+21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove special case for css in OC.filePath | ||||
| * | | | | | | Add beforeeach and aftereach | Lukas Reschke | 2014-09-09 | 1 | -4/+6 |
| | | | | | | | |||||
| * | | | | | | Add unittest for filePath | Lukas Reschke | 2014-09-09 | 1 | -0/+18 |
| | | | | | | | |||||
| * | | | | | | Remove special case for css in OC.filePath | Robin Appelman | 2014-07-21 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #10949 from owncloud/allow_prefilling_login | Jörn Friedrich Dreyer | 2014-09-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | allow prefilling login | ||||
| * | | | | | | | allow prefilling login | Jörn Friedrich Dreyer | 2014-09-08 | 1 | -2/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #7323 from owncloud/Jonny007-MKD-master | Lukas Reschke | 2014-09-09 | 3 | -6/+41 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update adapter.php |