Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge pull request #8547 from owncloud/path-length-master | Thomas Müller | 2014-05-29 | 4 | -5/+141 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | # This is a combination of 2 commits. | Thomas Müller | 2014-05-28 | 4 | -5/+141 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #8754 from owncloud/3rdparty-upgraded-phpmailer | Lukas Reschke | 2014-05-28 | 3 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Update 3rdparty submodule after merge | Thomas Müller | 2014-05-28 | 1 | -0/+0 | |
| * | | | | | | | | updating unit test expectations | Thomas Müller | 2014-05-28 | 1 | -1/+1 | |
| * | | | | | | | | upgraded phpmailer into v5.2.8 via composer | Volkan Gezer | 2014-05-27 | 2 | -2/+0 | |
* | | | | | | | | | Merge pull request #8681 from owncloud/logintimestamp | Lukas Reschke | 2014-05-28 | 8 | -19/+314 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'logintimestamp' of git://github.com/owncloud/core into logintim... | Arthur Schiwon | 2014-05-26 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Clarify comment | Lukas Reschke | 2014-05-24 | 1 | -1/+1 | |
| * | | | | | | | | | drop superflous statement in phpdoc | Arthur Schiwon | 2014-05-26 | 1 | -2/+0 | |
| * | | | | | | | | | add preRememberedLogin hook and document this and postRememberedLogin in clas... | Arthur Schiwon | 2014-05-26 | 1 | -1/+4 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | print time in 24h format | Arthur Schiwon | 2014-05-23 | 1 | -1/+1 | |
| * | | | | | | | | increase scrutinizer happyiness by removing minor/informational issues | Arthur Schiwon | 2014-05-23 | 2 | -3/+1 | |
| * | | | | | | | | save a whitespace | Arthur Schiwon | 2014-05-23 | 1 | -2/+2 | |
| * | | | | | | | | add cli command to check a users last login | Arthur Schiwon | 2014-05-23 | 2 | -0/+48 | |
| * | | | | | | | | clean up here is superflous, will already be removed by user session | Arthur Schiwon | 2014-05-23 | 1 | -6/+0 | |
| * | | | | | | | | test hooks also on login | Arthur Schiwon | 2014-05-23 | 1 | -3/+39 | |
| * | | | | | | | | also test whether hooks work | Arthur Schiwon | 2014-05-23 | 1 | -5/+39 | |
| * | | | | | | | | unit tests for loginWithCookie() | Arthur Schiwon | 2014-05-23 | 1 | -0/+114 | |
| * | | | | | | | | clean up tryRememberLogin and save the timestamp of users last login | Arthur Schiwon | 2014-05-21 | 5 | -15/+85 | |
* | | | | | | | | | Merge pull request #8768 from owncloud/scanner_visibility | icewind1991 | 2014-05-28 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Change visibility of scanner internals | ringmaster | 2014-05-28 | 1 | -4/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #8755 from owncloud/fix-8737-master | Vincent Petry | 2014-05-28 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | remove legacy OC_Filesystem being used in a hook callback | Thomas Müller | 2014-05-28 | 1 | -2/+2 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #8750 from owncloud/l10n-add-title-property | Volkan Gezer | 2014-05-28 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | add title property to share dialog | Volkan Gezer | 2014-05-27 | 1 | -2/+2 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #8732 from owncloud/fix-warning-text | Jan-Christoph Borchardt | 2014-05-28 | 2 | -9/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fix warning text and margin | Volkan Gezer | 2014-05-27 | 2 | -9/+4 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-28 | 404 | -3137/+5001 | |
| |_|/ / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #8713 from owncloud/typo-files-encr | Thomas Müller | 2014-05-27 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | fix grammar | Volkan Gezer | 2014-05-25 | 1 | -2/+2 | |
* | | | | | | | | Merge pull request #8136 from owncloud/contactsmanager-register | Bart Visscher | 2014-05-27 | 3 | -37/+71 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | no return on register and unregister | Thomas Müller | 2014-05-19 | 1 | -2/+2 | |
| * | | | | | | | | Merge branch 'master' into contactsmanager-register | Thomas Müller | 2014-05-19 | 1822 | -48608/+102803 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix wrong var name | Bart Visscher | 2014-04-26 | 1 | -1/+1 | |
| * | | | | | | | | | Merge branch 'master' into contactsmanager-register | Bart Visscher | 2014-04-26 | 1201 | -25369/+58821 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | camelCase vars in OC\ContactsManager | Bart Visscher | 2014-04-17 | 1 | -34/+34 | |
| * | | | | | | | | | | Supply the contactsmanager object to the callbacks | Bart Visscher | 2014-04-10 | 1 | -1/+1 | |
| * | | | | | | | | | | $key is not needed for registering contactsmanager callbacks | Bart Visscher | 2014-04-10 | 2 | -5/+3 | |
| * | | | | | | | | | | Implement the register function of OC\ContactsManager | Bart Visscher | 2014-04-09 | 1 | -12/+48 | |
* | | | | | | | | | | | Merge pull request #8744 from owncloud/l10n-whoops-user-ldap | blizzz | 2014-05-27 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | forgotten infobox messages translations | Volkan Gezer | 2014-05-27 | 1 | -4/+4 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #8740 from owncloud/l10n-forgotten-tags | Volkan Gezer | 2014-05-27 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
| * | | | | | | | | | reverts 188c543 and translates only mail | Volkan Gezer | 2014-05-27 | 1 | -2/+2 | |
* | | | | | | | | | | Merge pull request #8736 from owncloud/appinfo-newrequirefields | Vincent Petry | 2014-05-27 | 11 | -103/+284 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Adjust core apps to use "requiremin" instead of "require" | Vincent Petry | 2014-05-27 | 8 | -12/+12 | |
| * | | | | | | | | | | Added requiremin/requiremax fields for apps | Vincent Petry | 2014-05-27 | 3 | -91/+272 | |
* | | | | | | | | | | | Merge pull request #8721 from owncloud/sharing_don_lose_filesize | Vincent Petry | 2014-05-27 | 2 | -10/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | don't lose file size during rename | Bjoern Schiessle | 2014-05-26 | 2 | -10/+46 | |
* | | | | | | | | | | | | Merge pull request #8733 from owncloud/l10n-forgotten-tags | Vincent Petry | 2014-05-27 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | | |