summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix svg of calendar filetype iconJan-Christoph Borchardt2014-09-112-34/+32
|
* fix size of toggle icon, make container squareJan-Christoph Borchardt2014-09-112-4/+1
|
* improve style of checkmark icon, less bold, fitting ownCloud styleJan-Christoph Borchardt2014-09-112-3/+1
|
* Merge pull request #11006 from ↵Thomas Müller2014-09-111-2/+18
|\ | | | | | | | | owncloud/addCustomHex2BinImplementationBecauseSupporting53IsSomethingReallyReallyCoolAndWeAreObviouslySomeOfTheCoolGuys Add custom hex2bin implementation for 5.3
| * Add custom hex2bin implementation for 5.3Lukas Reschke2014-09-111-2/+18
| | | | | | | | Fixes https://github.com/owncloud/core/issues/11004
* | Merge pull request #11007 from owncloud/replaces-10850Thomas Müller2014-09-113-1/+3
|\ \ | | | | | | Add X-UA-Compatible to all templates
| * | Add X-UA-Compatible to all templatesLukas Reschke2014-09-113-1/+3
| | | | | | | | | | | | Replaces https://github.com/owncloud/core/pull/10850
* | | Merge pull request #3937 from owncloud/refresh_if_maintenance_is_overLukas Reschke2014-09-114-2/+25
|\ \ \ | |/ / |/| | Refresh if maintenance mode is over
| * | Refresh if maintenance mode is overkondou2014-09-094-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_luceneLukas Reschke2014-09-113-2/+66
|\ \ \ | |_|/ |/| | repair search lucene before installing
| * | repair search lucene before installingJörn Friedrich Dreyer2014-09-103-2/+66
| |/
* | Merge pull request #9698 from owncloud/fix-9666Thomas Müller2014-09-113-6/+8
|\ \ | | | | | | Load apps in tests, fixes #9666
| * | Fix contructor in testRobin Appelman2014-09-101-3/+3
| | |
| * | Fix mkdir error in mountconfig.phpRobin McCorkell2014-09-101-1/+1
| | |
| * | Load apps in test situationsRobin McCorkell2014-09-102-2/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1128-151/+774
| | |
* | | Merge pull request #10992 from oparoz/patch-3Robin McCorkell2014-09-101-0/+4
|\ \ \ | |/ / |/| | Create .user.ini for PHP-FPM
| * | Create .user.ini for PHP-FPMOlivier Paroz2014-09-101-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-nameThomas Müller2014-09-101-1/+1
|\ \ \ | |/ / |/| | Fix method name useTransactions
| * | Fix method nameRobin Appelman2014-09-101-1/+1
| | |
* | | Merge pull request #10990 from owncloud/fix-testCallRegister-masterLukas Reschke2014-09-101-1/+1
|\ \ \ | | | | | | | | requesttoken has now a length of 30 chars
| * | | requesttoken has now a length of 30 charsThomas Müller2014-09-101-1/+1
|/ / /
* | | Merge pull request #10929 from owncloud/issue/10514Vincent Petry2014-09-101-0/+1
|\ \ \ | |/ / |/| | Set overwritewebroot when installing owncloud to avoid problems
| * | Set overwritewebroot when installing owncloud to avoid problemsJoas Schilling2014-09-081-0/+1
| | | | | | | | | | | | Fix #10514
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-1039-41/+89
| | |
* | | Merge pull request #9512 from libasys/patch-2Lukas Reschke2014-09-091-1/+2
|\ \ \ | | | | | | | | Fix use Sharing Api with calendar
| * | | Fix use Sharing Api with calendarlibasys2014-07-081-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-enableappsLukas Reschke2014-09-094-9/+304
|\ \ \ \ | | | | | | | | | | Added acceptance tests for enabling apps
| * | | | Added acceptance tests for enabling appsVincent Petry2014-09-034-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-defaultsBernhard Posselt2014-09-092-4/+28
|\ \ \ \ \ | | | | | | | | | | | | Allow default values for route parameters.
| * | | | | Allow default values for route parameters.Patrick Paysant2014-09-092-4/+28
| | | | | |
* | | | | | Merge pull request #10922 from owncloud/explicit-scan-transactionsLukas Reschke2014-09-095-6/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Use bigger transactions when doing explicit file system scans
| * | | | | Fix typoLukas Reschke2014-09-081-1/+1
| | | | | |
| * | | | | Use bigger transactions when doing explicit file system scansRobin Appelman2014-09-085-6/+35
| | |_|/ / | |/| | |
* | | | | Merge pull request #10969 from owncloud/set-eVincent Petry2014-09-092-0/+5
|\ \ \ \ \ | | | | | | | | | | | | terminate script execution in case of failure
| * | | | | terminate script execution in case of failureThomas Müller2014-09-092-0/+5
| | |_|_|/ | |/| | |
* | | | | Merge pull request #10964 from owncloud/static-array-functionsBernhard Posselt2014-09-091-7/+29
|\ \ \ \ \ | |/ / / / |/| | | | More sugar for including lists of files in templates
| * | | | more sugar for including lists of templatesBernhard Posselt2014-09-091-7/+29
|/ / / /
* | | | Merge pull request #10948 from owncloud/fix-zindexLukas Reschke2014-09-091-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 mobileJan-Christoph Borchardt2014-09-081-3/+3
| | | | |
* | | | | Merge pull request #10947 from owncloud/html-importsBernhard Posselt2014-09-091-0/+10
|\ \ \ \ \ | | | | | | | | | | | | add template functions for html imports
| * | | | | append .html since componets always use html filesBernhard Posselt2014-09-081-1/+1
| | | | | |
| * | | | | add template functions for html importsBernhard Posselt2014-09-081-0/+10
| | | | | |
* | | | | | Merge pull request #9753 from owncloud/filepath-cssThomas Müller2014-09-092-1/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove special case for css in OC.filePath
| * | | | | | Add beforeeach and aftereachLukas Reschke2014-09-091-4/+6
| | | | | | |
| * | | | | | Add unittest for filePathLukas Reschke2014-09-091-0/+18
| | | | | | |
| * | | | | | Remove special case for css in OC.filePathRobin Appelman2014-07-211-1/+1
| | | | | | |
* | | | | | | Merge pull request #10949 from owncloud/allow_prefilling_loginJörn Friedrich Dreyer2014-09-091-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | allow prefilling login
| * | | | | | | allow prefilling loginJörn Friedrich Dreyer2014-09-081-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #7323 from owncloud/Jonny007-MKD-masterLukas Reschke2014-09-093-6/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update adapter.php