Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove some more global variable $RUNTIME_NOAPPS | Thomas Müller | 2014-02-06 | 1 | -1/+0 |
| | |||||
* | remove global variable $RUNTIME_NOAPPS - it's just superfluous | Thomas Müller | 2014-02-06 | 1 | -3/+0 |
| | |||||
* | Merge pull request #7067 from owncloud/core-sessionheartbeatconfig | Vincent Petry | 2014-02-05 | 4 | -16/+135 |
|\ | | | | | Core sessionheartbeatconfig | ||||
| * | fixing typos | Thomas Müller | 2014-02-04 | 1 | -2/+2 |
| | | |||||
| * | Added unit tests for session_keepalive / heartbeat | Vincent Petry | 2014-02-04 | 2 | -1/+91 |
| | | |||||
| * | Added session_keepalive setting | Vincent Petry | 2014-02-04 | 2 | -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-morecoverage | Thomas Müller | 2014-02-04 | 2 | -24/+118 |
|\ \ | | | | | | | Fixed unit test scripts + coverage | ||||
| * | | Added core unit tests for basename and dirname | Vincent Petry | 2014-01-30 | 1 | -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 + coverage | Vincent Petry | 2014-01-30 | 1 | -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/setup | Morris Jobke | 2014-02-04 | 3 | -135/+154 |
|\ \ \ | |_|/ |/| | | Move core setup code to controller class | ||||
| * | | Use === instead of ==, add missing whitespace and CSS class | Morris Jobke | 2014-02-01 | 1 | -2/+2 |
| | | | |||||
| * | | DRY for database type radiolist | Bart Visscher | 2014-01-31 | 2 | -54/+25 |
| | | | |||||
| * | | Do setup default value handling in the controller not the template | Bart Visscher | 2014-01-31 | 2 | -9/+19 |
| | | | |||||
| * | | Merge branch 'master' into setup | Bart Visscher | 2014-01-31 | 172 | -2216/+9114 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: core/setup.php | ||||
| * | | | fix undefined $htaccessWorking | Morris Jobke | 2013-10-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into setup | Bart Visscher | 2013-10-02 | 100 | -82/+1281 |
| |\ \ \ | |||||
| * | | | | Copyright and small fix | Bart Visscher | 2013-10-02 | 1 | -1/+7 |
| | | | | | |||||
| * | | | | fixing typo on $htaccessWorking - testing own code before pushing is appreciated | Thomas Müller | 2013-09-24 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into setup | Bart Visscher | 2013-09-12 | 7 | -23/+68 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/util.php | ||||
| * | | | | | Check for failure in creating htaccessWorking testfile | Bart Visscher | 2013-09-10 | 1 | -2/+12 |
| | | | | | | |||||
| * | | | | | Move core setup code to controller class | Bart Visscher | 2013-09-10 | 2 | -59/+79 |
| | | | | | | |||||
* | | | | | | better picture icon, fix https://github.com/owncloud/apps/issues/1401 | Jan-Christoph Borchardt | 2014-02-03 | 2 | -4/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #6278 from nickvergessen/issue/6263 | Raghu Nayyar | 2014-01-29 | 2 | -15/+20 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | [issue/6263] layout.user.php code is not valid markup | ||||
| * | | | | | Add alt attribute for img elements | Joas Schilling | 2014-01-10 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Extend margin to avoid displaying a scrollbar | Joas Schilling | 2014-01-10 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix unallowed child elements | Joas Schilling | 2014-01-10 | 1 | -11/+16 |
| | | | | | | |||||
* | | | | | | Merge pull request #6777 from owncloud/mobile-style | Jan-Christoph Borchardt | 2014-01-29 | 6 | -2/+22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Mobile style for public links: files, folders, picture sets | ||||
| * \ \ \ \ \ | merge master into mobile-style | Jan-Christoph Borchardt | 2014-01-29 | 14 | -81/+4891 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into mobile-style | Thomas Müller | 2014-01-23 | 9 | -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 pages | Jan-Christoph Borchardt | 2014-01-17 | 2 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | optimize size of toggle icons | Jan-Christoph Borchardt | 2014-01-17 | 4 | -248/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | add icons for file list and picture view toggles | Jan-Christoph Borchardt | 2014-01-17 | 4 | -0/+252 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Add white color variant of checkmark icon | jbtbnl | 2014-01-29 | 3 | -0/+8 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink | Morris Jobke | 2014-01-29 | 2 | -0/+71 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Sharing fixfiledownloadlink | ||||
| * | | | | | | | Fixed download URL in public page | Vincent Petry | 2014-01-24 | 1 | -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 function | Vincent Petry | 2014-01-24 | 2 | -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_date | Morris Jobke | 2014-01-27 | 1 | -5/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | use localised date in notification mails | ||||
| * | | | | | | | use localised date in notification mails | Bjoern Schiessle | 2014-01-27 | 1 | -5/+4 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #6912 from owncloud/replace-webroot-in-css | Morris Jobke | 2014-01-27 | 1 | -0/+240 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Remove %webroot% from CSS | ||||
| * | | | | | | | add icons.css file, first step to get rid of %webroot% | Jan-Christoph Borchardt | 2014-01-23 | 1 | -0/+240 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #5153 from owncloud/core-em-to-px | Jan-Christoph Borchardt | 2014-01-27 | 4 | -73/+72 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Cleans up Core apps for relative(em) to absolute(px) styles. | ||||
| * | | | | | | | Fixes width of the dropdown menus as per computed styles. | raghunayyar | 2014-01-26 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Fixes typos, adds ; wherever not present. | raghunayyar | 2014-01-16 | 1 | -18/+18 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into core-em-to-px | raghunayyar | 2014-01-16 | 145 | -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.css | raghunayyar | 2013-10-07 | 4 | -27/+27 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #5152 from owncloud/files-em-to-px | Jan-Christoph Borchardt | 2014-01-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Converts em to px values for styles in Files. | ||||
| * | | | | | | | | | remove comment & add space | Morris Jobke | 2014-01-18 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase | raghunayyar | 2014-01-16 | 1 | -1/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #6905 from owncloud/add_expiredate_to_linkshare | Vincent Petry | 2014-01-24 | 2 | -3/+24 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | add expire date to link share if possible | ||||
| * | | | | | | | | | add expire date to link share if possible | Bjoern Schiessle | 2014-01-24 | 2 | -3/+24 |
| | |_|_|/ / / / / | |/| | | | | | | |