summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* remove some more global variable $RUNTIME_NOAPPSThomas Müller2014-02-061-1/+0
|
* remove global variable $RUNTIME_NOAPPS - it's just superfluousThomas Müller2014-02-061-3/+0
|
* Merge pull request #7067 from owncloud/core-sessionheartbeatconfigVincent Petry2014-02-054-16/+135
|\ | | | | Core sessionheartbeatconfig
| * fixing typosThomas Müller2014-02-041-2/+2
| |
| * Added unit tests for session_keepalive / heartbeatVincent Petry2014-02-042-1/+91
| |
| * Added session_keepalive settingVincent Petry2014-02-042-15/+44
| | | | | | | | | | When session_keepalive is true (default) the heartbeat will be send as often as the half of the session timeout value.
* | Merge pull request #6969 from owncloud/tests-morecoverageThomas Müller2014-02-042-24/+118
|\ \ | | | | | | Fixed unit test scripts + coverage
| * | Added core unit tests for basename and dirnameVincent Petry2014-01-301-0/+99
| | | | | | | | | | | | | | | Note that it doesn't work 100% like the PHP functions so the tests have TODO comments to fix those core functions eventually.
| * | Fixed unit test scripts + coverageVincent Petry2014-01-301-24/+19
| | | | | | | | | | | | | | | Tried to add more apps (others break). "preprocessors" is now populated automatically based on the tested apps.
* | | Merge pull request #4795 from owncloud/setupMorris Jobke2014-02-043-135/+154
|\ \ \ | |_|/ |/| | Move core setup code to controller class
| * | Use === instead of ==, add missing whitespace and CSS classMorris Jobke2014-02-011-2/+2
| | |
| * | DRY for database type radiolistBart Visscher2014-01-312-54/+25
| | |
| * | Do setup default value handling in the controller not the templateBart Visscher2014-01-312-9/+19
| | |
| * | Merge branch 'master' into setupBart Visscher2014-01-31172-2216/+9114
| |\ \ | | | | | | | | | | | | | | | | Conflicts: core/setup.php
| * | | fix undefined $htaccessWorkingMorris Jobke2013-10-071-1/+1
| | | |
| * | | Merge remote-tracking branch 'origin/master' into setupBart Visscher2013-10-02100-82/+1281
| |\ \ \
| * | | | Copyright and small fixBart Visscher2013-10-021-1/+7
| | | | |
| * | | | fixing typo on $htaccessWorking - testing own code before pushing is appreciatedThomas Müller2013-09-241-1/+2
| | | | |
| * | | | Merge branch 'master' into setupBart Visscher2013-09-127-23/+68
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/util.php
| * | | | | Check for failure in creating htaccessWorking testfileBart Visscher2013-09-101-2/+12
| | | | | |
| * | | | | Move core setup code to controller classBart Visscher2013-09-102-59/+79
| | | | | |
* | | | | | better picture icon, fix https://github.com/owncloud/apps/issues/1401Jan-Christoph Borchardt2014-02-032-4/+1
| | | | | |
* | | | | | Merge pull request #6278 from nickvergessen/issue/6263Raghu Nayyar2014-01-292-15/+20
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | [issue/6263] layout.user.php code is not valid markup
| * | | | | Add alt attribute for img elementsJoas Schilling2014-01-101-3/+3
| | | | | |
| * | | | | Extend margin to avoid displaying a scrollbarJoas Schilling2014-01-101-1/+1
| | | | | |
| * | | | | Fix unallowed child elementsJoas Schilling2014-01-101-11/+16
| | | | | |
* | | | | | Merge pull request #6777 from owncloud/mobile-styleJan-Christoph Borchardt2014-01-296-2/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Mobile style for public links: files, folders, picture sets
| * \ \ \ \ \ merge master into mobile-styleJan-Christoph Borchardt2014-01-2914-81/+4891
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into mobile-styleThomas Müller2014-01-239-32/+52
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/files.js apps/files_sharing/css/public.css apps/files_sharing/js/public.js apps/files_sharing/templates/public.php
| * | | | | | | | restrict zooming on mobile devices for the publicly accessible, optimized pagesJan-Christoph Borchardt2014-01-172-2/+2
| | | | | | | | |
| * | | | | | | | optimize size of toggle iconsJan-Christoph Borchardt2014-01-174-248/+16
| | | | | | | | |
| * | | | | | | | add icons for file list and picture view togglesJan-Christoph Borchardt2014-01-174-0/+252
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Add white color variant of checkmark iconjbtbnl2014-01-293-0/+8
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #6929 from owncloud/sharing-fixfiledownloadlinkMorris Jobke2014-01-292-0/+71
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Sharing fixfiledownloadlink
| * | | | | | | Fixed download URL in public pageVincent Petry2014-01-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Refactored download URL building to make it overridable - Added download URL override in public page - Added JS unit tests for download URL - Added OC.redirect() method to facilitate unit testing
| * | | | | | | Added OC.buidQueryString() utility functionVincent Petry2014-01-242-0/+65
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Makes it possible to create query strings by passing a JavaScript hash map and automatically encodes the keys and values.
* | | | | | | Merge pull request #6958 from owncloud/localised_dateMorris Jobke2014-01-271-5/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | use localised date in notification mails
| * | | | | | | use localised date in notification mailsBjoern Schiessle2014-01-271-5/+4
| | | | | | | |
* | | | | | | | Merge pull request #6912 from owncloud/replace-webroot-in-cssMorris Jobke2014-01-271-0/+240
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Remove %webroot% from CSS
| * | | | | | | add icons.css file, first step to get rid of %webroot%Jan-Christoph Borchardt2014-01-231-0/+240
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #5153 from owncloud/core-em-to-pxJan-Christoph Borchardt2014-01-274-73/+72
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Cleans up Core apps for relative(em) to absolute(px) styles.
| * | | | | | | Fixes width of the dropdown menus as per computed styles.raghunayyar2014-01-261-1/+1
| | | | | | | |
| * | | | | | | Fixes typos, adds ; wherever not present.raghunayyar2014-01-161-18/+18
| | | | | | | |
| * | | | | | | Merge branch 'master' into core-em-to-pxraghunayyar2014-01-16145-2021/+3809
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/css/public.css apps/user_ldap/css/settings.css core/css/multiselect.css core/css/share.css
| * | | | | | | | All Core Styles from em->px, apart from styles.cssraghunayyar2013-10-074-27/+27
| | | | | | | | |
* | | | | | | | | Merge pull request #5152 from owncloud/files-em-to-pxJan-Christoph Borchardt2014-01-271-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Converts em to px values for styles in Files.
| * | | | | | | | | remove comment & add spaceMorris Jobke2014-01-181-2/+1
| | | | | | | | | |
| * | | | | | | | | Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebaseraghunayyar2014-01-161-1/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #6905 from owncloud/add_expiredate_to_linkshareVincent Petry2014-01-242-3/+24
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | add expire date to link share if possible
| * | | | | | | | | add expire date to link share if possibleBjoern Schiessle2014-01-242-3/+24
| | |_|_|/ / / / / | |/| | | | | | |