| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | | | | | | | | | | Merge branch 'master' into fix-5388-master | Thomas Müller | 2013-11-22 | 12 | -24/+162 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | Change OC_Migrate from MDB2 to Doctrine | Bart Visscher | 2013-11-22 | 3 | -107/+26 | |
| | * | | | | | | | | | | | | | | | | | Add WIP unit test for migration | tomneedham | 2014-01-07 | 1 | -0/+32 | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #7176 from owncloud/style | Lukas Reschke | 2014-02-18 | 8 | -12/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | $default of OC_Config::[gs]etValue can have more then string as type | Bart Visscher | 2014-02-12 | 4 | -8/+8 | |
| | * | | | | | | | | | | | | | | | | | Style fixes | Bart Visscher | 2014-02-12 | 2 | -2/+3 | |
| | * | | | | | | | | | | | | | | | | | number as number | Bart Visscher | 2014-02-12 | 2 | -2/+2 | |
| | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | 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 | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #7239 from owncloud/cbr-filetype-icon | Thomas Müller | 2014-02-18 | 3 | -0/+778 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | add cbr/cbz file type icon, fix #6953 | Jan-Christoph Borchardt | 2014-02-17 | 3 | -0/+778 | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #7235 from DavidVentura/master | Jan-Christoph Borchardt | 2014-02-17 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | small change for compatibility | David | 2014-02-17 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #7240 from owncloud/mimetype-fallback | icewind1991 | 2014-02-17 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | use file icon as fallback instead of application icon, fix #7237 | Jan-Christoph Borchardt | 2014-02-17 | 1 | -0/+1 | |
| | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #7211 from mattcaron/master | Vincent Petry | 2014-02-17 | 1 | -1/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | Consolidate two sections, per code review. Issue #1648 | Matthew Caron | 2014-02-17 | 1 | -6/+2 | |
| | * | | | | | | | | | | | | | | | | | | | Fit shared videos to viewer, just like images. Issue #1648 | Matthew Caron | 2014-02-14 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #7231 from owncloud/proper-content-type | Jörn Friedrich Dreyer | 2014-02-17 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Use the proper content-type | Lukas Reschke | 2014-02-17 | 1 | -0/+2 | |
| | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #7233 from owncloud/fix_5567 | Jörn Friedrich Dreyer | 2014-02-17 | 3 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | LDAP: improve wizard strings, fixes #5567 | Arthur Schiwon | 2014-02-17 | 3 | -3/+3 | |
| |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | 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 #6892 from owncloud/issuetemplate-enhancements | Lukas Reschke | 2014-02-17 | 1 | -16/+23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Removed quota question | Vincent Petry | 2014-02-17 | 1 | -2/+0 | |
| | * | | | | | | | | | | | | | | | | | | | Added boldening of entries for readability | Vincent Petry | 2014-01-22 | 1 | -13/+18 | |
| | * | | | | | | | | | | | | | | | | | | | Added explicit quota + encryption questions | Vincent Petry | 2014-01-22 | 1 | -1/+5 | |
| | * | | | | | | | | | | | | | | | | | | | Moved steps to reproduce to the top | Vincent Petry | 2014-01-22 | 1 | -5/+5 | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #7155 from owncloud/enc_improved_error_handling | Björn Schießle | 2014-02-17 | 8 | -53/+184 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | don't block login forever if we are stuck in the middle of the initial encryp... | Bjoern Schiessle | 2014-02-17 | 5 | -10/+24 | |
| | * | | | | | | | | | | | | | | | | | | | catch errors during decryption | Bjoern Schiessle | 2014-02-17 | 3 | -17/+113 | |
| | * | | | | | | | | | | | | | | | | | | | catch errors during initial encryption | Bjoern Schiessle | 2014-02-17 | 2 | -26/+47 | |
| |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #7156 from owncloud/backgroundjob-public | Thomas Müller | 2014-02-14 | 12 | -65/+437 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Add unit tests for JobList | Robin Appelman | 2014-02-12 | 4 | -26/+238 | |
| | * | | | | | | | | | | | | | | | | | | Additional phpdoc | Robin Appelman | 2014-02-12 | 3 | -6/+31 | |
| | * | | | | | | | | | | | | | | | | | | Remove internal methods from the public interface | Robin Appelman | 2014-02-12 | 1 | -7/+1 | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' into backgroundjob-public | Robin Appelman | 2014-02-12 | 6 | -1/+37 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | Add the background job list to the public server container | Robin Appelman | 2014-02-11 | 9 | -38/+179 | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #7207 from owncloud/fileinfo-serializable | Morris Jobke | 2014-02-14 | 1 | -5/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | remove the JsonSerializable interface from \OC\Files\FileInfo | Robin Appelman | 2014-02-14 | 1 | -5/+1 | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #7204 from owncloud/groupexists-duplicate | Thomas Müller | 2014-02-14 | 2 | -10/+41 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Fix test cases for group manager | Robin Appelman | 2014-02-14 | 2 | -4/+37 | |
| | * | | | | | | | | | | | | | | | | | | | | remove duplicate call to groupExists | Robin Appelman | 2014-02-14 | 1 | -6/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #7206 from owncloud/fix_enc_tests | blizzz | 2014-02-14 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | fileinfo is no longer a array | Bjoern Schiessle | 2014-02-14 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #6748 from owncloud/fileinfo | icewind1991 | 2014-02-14 | 8 | -34/+367 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | merge master into fileinfo | Robin Appelman | 2014-01-29 | 125 | -5300/+16010 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Add isReadable, isUpdateable, isDeletable, isShareable | Robin Appelman | 2014-01-24 | 2 | -1/+65 | |
| | * | | | | | | | | | | | | | | | | | | | | undo 3rdparty change | Robin Appelman | 2014-01-20 | 1 | -0/+0 | |
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |