| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #7289 from owncloud/fix-filetype-icons | Lukas Reschke | 2014-02-20 | 6 | -0/+0 |
|\ |
|
| * | merge master | Jan-Christoph Borchardt | 2014-02-20 | 168 | -2847/+1017 |
| |\ |
|
| * | | Optimize images | kondou | 2014-02-19 | 6 | -122/+108 |
| * | | fix lots of file type icons for archives, js, flash, ics, fonts, code, ... | Jan-Christoph Borchardt | 2014-02-19 | 6 | -0/+0 |
* | | | Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core | Jörn Friedrich Dreyer | 2014-02-20 | 3 | -3/+17 |
|\ \ \ |
|
| * | | | Moved Core Theme Logos to CSS | Jake Wilson | 2013-10-10 | 3 | -3/+17 |
* | | | | Merge pull request #7247 from owncloud/sharing_cleanup_step1 | Björn Schießle | 2014-02-20 | 1 | -99/+13 |
|\ \ \ \ |
|
| * | | | | clean up the sharing ajax calls, add mail notification class | Bjoern Schiessle | 2014-02-19 | 1 | -99/+13 |
* | | | | | Merge pull request #7255 from owncloud/fix-admin-remote | Lukas Reschke | 2014-02-20 | 1 | -6/+21 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | Check whether the app is set | Lukas Reschke | 2014-02-18 | 1 | -1/+4 |
| * | | | | Check whether the Key is set | Lukas Reschke | 2014-02-18 | 1 | -1/+1 |
| * | | | | An admin should not be able to add remote and public services on its own. Thi... | Lukas Reschke | 2014-02-18 | 1 | -6/+18 |
* | | | | | Optimize some images | kondou | 2014-02-19 | 174 | -2969/+1125 |
| |_|_|/
|/| | | |
|
* | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2014-02-19 | 4 | -7/+0 |
* | | | | Merge pull request #7114 from owncloud/scrutinizer_documentation_patches | Thomas Müller | 2014-02-19 | 1 | -0/+8 |
|\ \ \ \ |
|
| * | | | | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-18 | 4 | -5/+772 |
| |\| | | |
|
| * | | | | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-14 | 3 | -2/+6 |
| |\ \ \ \ |
|
| * | | | | | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 1 | -0/+8 |
* | | | | | | Merge pull request #7252 from owncloud/autocomplete-autocapitalize-autocorrect | Tom Needham | 2014-02-18 | 2 | -12/+22 |
|\ \ \ \ \ \
| |_|_|/ / /
|/| | | | | |
|
| * | | | | | do not autocapitalize fields on mobile, fix user name input. Also disable aut... | Jan-Christoph Borchardt | 2014-02-18 | 2 | -12/+22 |
| | |_|/ /
| |/| | | |
|
* | | | | | Merge pull request #7243 from owncloud/core-sessionlifetimedefault | Thomas Müller | 2014-02-18 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | Now using PHP session lifetime as default value for the JS config | Vincent Petry | 2014-02-17 | 1 | -1/+1 |
| | |_|/ /
| |/| | | |
|
* | | | | | add cbr/cbz file type icon, fix #6953 | Jan-Christoph Borchardt | 2014-02-17 | 2 | -0/+771 |
| |/ / /
|/| | | |
|
* | | | | Merge pull request #7132 from owncloud/issue/6920 | Jan-Christoph Borchardt | 2014-02-17 | 1 | -4/+0 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Do not select input for all text input fields | Joas Schilling | 2014-02-07 | 1 | -4/+0 |
| |/ / |
|
* | | | Merge pull request #6726 from owncloud/fix_6630 | Vincent Petry | 2014-02-14 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | remove empty line | Georg Ehrke | 2014-01-30 | 1 | -1/+0 |
| * | | | don't urldecode get var, php does this automatically | Georg Ehrke | 2014-01-30 | 1 | -1/+2 |
* | | | | fix DI | Arthur Schiwon | 2014-02-11 | 1 | -1/+2 |
* | | | | move sorter into a class | Arthur Schiwon | 2014-02-11 | 1 | -24/+3 |
* | | | | respect coding guidelines | Arthur Schiwon | 2014-02-11 | 1 | -1/+1 |
* | | | | on filtering the share box users and groups whose name begins with the search... | Arthur Schiwon | 2014-02-11 | 1 | -0/+24 |
* | | | | Change MySQL to MySQL/MariaDB in the frontend | Joas Schilling | 2014-02-07 | 1 | -1/+1 |
| |/ /
|/| | |
|
* | | | fixing autoconfig handling | Thomas Müller | 2014-02-05 | 1 | -4/+5 |
* | | | Merge pull request #7067 from owncloud/core-sessionheartbeatconfig | Vincent Petry | 2014-02-05 | 4 | -16/+135 |
|\ \ \ |
|
| * | | | 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 |
* | | | | Merge pull request #6969 from owncloud/tests-morecoverage | Thomas Müller | 2014-02-04 | 2 | -24/+118 |
|\ \ \ \ |
|
| * | | | | Added core unit tests for basename and dirname | Vincent Petry | 2014-01-30 | 1 | -0/+99 |
| * | | | | Fixed unit test scripts + coverage | Vincent Petry | 2014-01-30 | 1 | -24/+19 |
* | | | | | Merge pull request #4795 from owncloud/setup | Morris Jobke | 2014-02-04 | 3 | -135/+154 |
|\ \ \ \ \
| |_|/ / /
|/| | | | |
|
| * | | | | 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 |
| |\ \ \ \ |
|
| * | | | | | 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 |