Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | make knowledge base url configurable | Bjoern Schiessle | 2015-07-29 | 3 | -1/+27 |
* | Merge pull request #17950 from owncloud/config-dontdetectfschangesinrootbydef... | Robin McCorkell | 2015-07-29 | 3 | -2/+5 |
|\ | |||||
| * | Fix watcher tests to explicitly set policy | Vincent Petry | 2015-07-29 | 1 | -0/+3 |
| * | Disable filesystem_check_changes by default | Vincent Petry | 2015-07-29 | 2 | -2/+2 |
* | | Merge pull request #17923 from owncloud/fix-17921 | blizzz | 2015-07-29 | 1 | -8/+0 |
|\ \ | |||||
| * | | remove unused var | blizzz | 2015-07-29 | 1 | -2/+0 |
| * | | Remove Log info when no group filter is set, fixes #17921 | blizzz | 2015-07-28 | 1 | -6/+0 |
* | | | Merge pull request #17813 from owncloud/update-underscore | Morris Jobke | 2015-07-29 | 4 | -561/+768 |
|\ \ \ | |||||
| * | | | update underscore to 1.8.3 | Morris Jobke | 2015-07-27 | 4 | -561/+768 |
* | | | | Merge pull request #17946 from owncloud/settings-users-apprenderedforsearchbox | Morris Jobke | 2015-07-29 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | Trigger "apprendered" event in users page | Vincent Petry | 2015-07-29 | 1 | -0/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #17908 from rullzer/docker_mysql | Robin McCorkell | 2015-07-29 | 1 | -11/+44 |
|\ \ \ \ | |||||
| * | | | | Add possible use of docker instance for MariaDB | Roeland Jago Douma | 2015-07-29 | 1 | -11/+44 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #17464 from owncloud/fix-17232 | blizzz | 2015-07-29 | 9 | -98/+340 |
|\ \ \ \ | |||||
| * | | | | fix test after rebasing | Arthur Schiwon | 2015-07-27 | 1 | -1/+1 |
| * | | | | fix uncaught exception on not permitted file types when setting avatar, fixes... | Arthur Schiwon | 2015-07-27 | 1 | -1/+7 |
| * | | | | add integration tests for avatar update | Arthur Schiwon | 2015-07-27 | 5 | -2/+144 |
| * | | | | refactor integration tests to make it easier to add new ones | Arthur Schiwon | 2015-07-27 | 4 | -95/+189 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #17489 from owncloud/fix-share-time-as-string | Morris Jobke | 2015-07-29 | 2 | -0/+37 |
|\ \ \ \ | |||||
| * | | | | tests for _parseTime with hex and empty strings | Morris Jobke | 2015-07-28 | 2 | -0/+6 |
| * | | | | Fix parsing of sharetime as string | Morris Jobke | 2015-07-28 | 2 | -0/+31 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-29 | 70 | -0/+86 |
* | | | | | Merge pull request #17912 from owncloud/detect-old-openssl-versions | Robin McCorkell | 2015-07-28 | 4 | -11/+221 |
|\ \ \ \ \ | |||||
| * | | | | | Detect old NSS and OpenSSL versions | Lukas Reschke | 2015-07-28 | 4 | -11/+221 |
* | | | | | | Merge pull request #17922 from owncloud/smb-storageiddoubleslash | Robin McCorkell | 2015-07-28 | 2 | -1/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Double slash for SMB storage id for compatibility | Vincent Petry | 2015-07-28 | 2 | -1/+16 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #17927 from owncloud/fix_17925 | Vincent Petry | 2015-07-28 | 2 | -13/+177 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Add unit tests | Lukas Reschke | 2015-07-28 | 2 | -13/+176 |
| * | | | | | set logger in constructor | Bjoern Schiessle | 2015-07-28 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #15543 from rullzer/mimetypedetector | Morris Jobke | 2015-07-28 | 6 | -90/+521 |
|\ \ \ \ \ | |||||
| * | | | | | Pass config dir as parameter to detection class | Roeland Jago Douma | 2015-07-27 | 3 | -12/+214 |
| * | | | | | Proper deprecate methods | Roeland Jago Douma | 2015-07-27 | 2 | -14/+5 |
| * | | | | | Loading of mapping/aliases is done in class | Roeland Jago Douma | 2015-07-27 | 3 | -34/+48 |
| * | | | | | Move mimetypedetection to files/type/detection | Roeland Jago Douma | 2015-07-27 | 4 | -172/+64 |
| * | | | | | Added mimetype detector | Roeland Jago Douma | 2015-07-27 | 6 | -1/+333 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #17195 from rullzer/no_multiple_remote_shares_of_same_file | Roeland Douma | 2015-07-28 | 2 | -0/+49 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Added test | Roeland Jago Douma | 2015-07-15 | 1 | -0/+36 |
| * | | | | Cannot share the same file multiple times with remote user | Roeland Jago Douma | 2015-07-15 | 1 | -0/+13 |
* | | | | | Merge pull request #17910 from owncloud/fix-modified-tooltip | Morris Jobke | 2015-07-28 | 2 | -2/+3 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | fixed tooltip for modified date | Hendrik Leppelsack | 2015-07-27 | 2 | -2/+3 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-28 | 28 | -6/+226 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #17902 from owncloud/fix_17898 | Vincent Petry | 2015-07-27 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | get header size before we open the file to avoid locking exception | Bjoern Schiessle | 2015-07-27 | 1 | -1/+2 |
* | | | | | Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryption | Thomas Müller | 2015-07-27 | 5 | -4/+159 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | add condition to update query | Bjoern Schiessle | 2015-07-27 | 1 | -1/+1 |
| * | | | | Add an update script to reset the value | Joas Schilling | 2015-07-24 | 3 | -2/+98 |
| * | | | | Add a unit test for the disabled encryption case | Joas Schilling | 2015-07-23 | 1 | -1/+60 |
| * | | | | Only set is encrypted when encryption is enabled | Joas Schilling | 2015-07-23 | 1 | -1/+1 |
* | | | | | Merge pull request #17879 from owncloud/scan-check-path | Thomas Müller | 2015-07-27 | 2 | -0/+31 |
|\ \ \ \ \ | |||||
| * | | | | | Add unit tests | Lukas Reschke | 2015-07-27 | 1 | -0/+28 |