Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14211 from owncloud/activity/225-files-extension-jenkins | Vincent Petry | 2015-02-18 | 2 | -0/+285 |
|\ | |||||
| * | Move displaying of files related activities to files app | Joas Schilling | 2015-02-13 | 2 | -0/+285 |
* | | Merge pull request #14210 from owncloud/activity/225-sharing-extension-jenkins | Vincent Petry | 2015-02-18 | 3 | -75/+156 |
|\ \ | |||||
| * | | Use filterNotificationTypes to filter the types and group the methods | Joas Schilling | 2015-02-13 | 1 | -43/+37 |
| * | | Copy sharing related activity code to Files_Sharing activity extension | Joas Schilling | 2015-02-13 | 3 | -49/+136 |
* | | | Merge pull request #13857 from owncloud/phpseclib-0.3.9 | Thomas Müller | 2015-02-18 | 1 | -10/+2 |
|\ \ \ | |||||
| * | | | Update phpseclib to version 0.3.9. | Andreas Fischer | 2015-02-18 | 1 | -10/+2 |
* | | | | Merge pull request #14308 from owncloud/fix-14247 | Thomas Müller | 2015-02-18 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Add mapping for a broken varchar type. Fixes #14247 | Victor Dubiniuk | 2015-02-17 | 1 | -0/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-18 | 134 | -222/+76 |
* | | | | | Merge pull request #14273 from owncloud/require-at-least-apcu-4-0-6 | Lukas Reschke | 2015-02-18 | 3 | -0/+21 |
|\ \ \ \ \ | |||||
| * | | | | | Use APCu only if available in version 4.0.6 and higher | Lukas Reschke | 2015-02-17 | 3 | -0/+21 |
* | | | | | | Merge pull request #14207 from owncloud/propfind-optimize | Morris Jobke | 2015-02-18 | 2 | -18/+57 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | add unit test for webdav quota | Robin Appelman | 2015-02-13 | 1 | -0/+30 |
| * | | | | | pass fileinfo to getStorageInfo | Robin Appelman | 2015-02-13 | 1 | -2/+1 |
| * | | | | | Cache quota info for directories | Robin Appelman | 2015-02-13 | 1 | -16/+26 |
* | | | | | | Merge pull request #14293 from owncloud/issue/14270-fix-public-share-download... | Daniel Hansson | 2015-02-17 | 1 | -13/+35 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Correctly create activities for public downloads | Joas Schilling | 2015-02-17 | 1 | -13/+35 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #14266 from owncloud/encodeUriComponentPerDefault | Clark Tomlinson | 2015-02-17 | 2 | -6/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Encode parameters in `OC.generateUrl` by itself | Lukas Reschke | 2015-02-17 | 2 | -6/+28 |
| |/ / / / | |||||
* | | | | | Merge pull request #14289 from owncloud/remove-null-byte-check | Lukas Reschke | 2015-02-17 | 2 | -12/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Remove Null Byte Check | Lukas Reschke | 2015-02-17 | 2 | -12/+0 |
|/ / / / | |||||
* | | | | Merge pull request #14056 from owncloud/refactor/13976 | Lukas Reschke | 2015-02-17 | 37 | -824/+1516 |
|\ \ \ \ | |||||
| * | | | | Incorporate review changes | Lukas Reschke | 2015-02-16 | 3 | -9/+20 |
| * | | | | Add blackmagic due to cyclic dependency :see_no_evil: | Lukas Reschke | 2015-02-16 | 2 | -4/+11 |
| * | | | | Make scrutinizer happy | Lukas Reschke | 2015-02-16 | 3 | -3/+3 |
| * | | | | Refactor OC_Request into TrustedDomainHelper and IRequest | Lukas Reschke | 2015-02-16 | 37 | -822/+1496 |
* | | | | | Merge pull request #13866 from rullzer/avatar_share_dialog | Vincent Petry | 2015-02-17 | 5 | -3/+117 |
|\ \ \ \ \ | |||||
| * | | | | | Extended avatar unit tests | Roeland Jago Douma | 2015-02-13 | 1 | -14/+61 |
| * | | | | | Added config check | Roeland Jago Douma | 2015-02-13 | 2 | -8/+19 |
| * | | | | | Small unit test rewrite | Roeland Jago Douma | 2015-02-12 | 1 | -1/+1 |
| * | | | | | Added unit test | Roeland Jago Douma | 2015-02-12 | 2 | -2/+37 |
| * | | | | | Added dependancy for the JS unit tests | Roeland Jago Douma | 2015-02-12 | 1 | -1/+2 |
| * | | | | | Display user avatar in share dialog | Roeland Jago Douma | 2015-02-12 | 2 | -2/+22 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-17 | 346 | -472/+134 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #14261 from owncloud/fix-last-login-master | Lukas Reschke | 2015-02-16 | 2 | -12/+12 |
|\ \ \ \ \ | |||||
| * | | | | | fixing unit tests in UsersControllerTest | Thomas Müller | 2015-02-16 | 1 | -11/+11 |
| * | | | | | Return milliseconds instead of seconds for lastLogin - refs #14005 | Thomas Müller | 2015-02-16 | 1 | -1/+1 |
* | | | | | | Merge pull request #14263 from owncloud/missing-visibility-activity-iextension | Thomas Müller | 2015-02-16 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add visibility to interface to make scrutinizer 1 step happier | Joas Schilling | 2015-02-16 | 1 | -1/+1 |
* | | | | | | | Merge pull request #13879 from owncloud/add_debug_log_for_memcache_instantiation | Thomas Müller | 2015-02-16 | 3 | -7/+21 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | add debug log for memcache instantiation | Jörn Friedrich Dreyer | 2015-02-16 | 3 | -7/+21 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #14128 from owncloud/drop-unused-methods | Morris Jobke | 2015-02-16 | 3 | -48/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove unused function and correct PHPDoc | Lukas Reschke | 2015-02-16 | 3 | -48/+10 |
* | | | | | | | Merge pull request #10673 from owncloud/smb-new | Morris Jobke | 2015-02-16 | 77 | -670/+5411 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | also make sure we have a leading slash for the test root | Robin Appelman | 2015-02-16 | 2 | -4/+3 |
| * | | | | | | make sure the root has a trailing slash | Robin Appelman | 2015-02-16 | 1 | -0/+3 |
| * | | | | | | remove outdated test | Robin Appelman | 2015-02-16 | 1 | -39/+0 |
| * | | | | | | handle deleting non existing files | Robin Appelman | 2015-02-16 | 1 | -7/+11 |
| * | | | | | | Use better way to check for the existence of smbclient | Robin Appelman | 2015-02-16 | 1 | -7/+2 |