| Commit message (Expand) | Author | Age | Files | Lines |
* | Update submodule to include the PostgresPlatform patch | Vincent Petry | 2014-07-01 | 1 | -0/+0 |
* | Added test for reserved keywords | Vincent Petry | 2014-07-01 | 1 | -0/+22 |
* | Fix migrator tests to use the correct migrator instances | Vincent Petry | 2014-07-01 | 2 | -13/+11 |
* | Merge pull request #9292 from owncloud/issue/9161 | Morris Jobke | 2014-07-01 | 1 | -2/+2 |
|\ |
|
| * | Use get random bytes as uniqeid() is not unique in some cases | Joas Schilling | 2014-06-30 | 1 | -2/+2 |
* | | Merge pull request #9307 from Gomez/master | Steffen Lindner | 2014-07-01 | 1 | -1/+1 |
|\ \ |
|
| * | | Fixes typo with sendmail detection - fixes #9203 | Steffen Lindner | 2014-06-30 | 1 | -1/+1 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-07-01 | 46 | -278/+427 |
* | | | Merge pull request #9240 from owncloud/enc_check_if_file_exists | Björn Schießle | 2014-06-30 | 2 | -38/+237 |
|\ \ \ |
|
| * | | | improved error message | Bjoern Schiessle | 2014-06-30 | 1 | -7/+8 |
| * | | | unit tests | Bjoern Schiessle | 2014-06-27 | 1 | -19/+192 |
| * | | | check if file exists before deleting keys, and add debug output for every | Bjoern Schiessle | 2014-06-27 | 1 | -15/+40 |
* | | | | Merge pull request #9305 from owncloud/design-share-fixes | Jan-Christoph Borchardt | 2014-06-30 | 3 | -4/+7 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | make expiration message grey, less present in dropdown | Jan-Christoph Borchardt | 2014-06-30 | 1 | -1/+1 |
| * | | | fix expire message going out of box, fix #9280 | Jan-Christoph Borchardt | 2014-06-30 | 1 | -1/+2 |
| * | | | remove obsolete CSS, fix visual bug in share dialog #9255 | Jan-Christoph Borchardt | 2014-06-30 | 1 | -2/+4 |
* | | | | Merge pull request #9303 from owncloud/issue/8841 | Jörn Friedrich Dreyer | 2014-06-30 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Use attr() instead of data() so the item ids work as intended | Joas Schilling | 2014-06-30 | 1 | -1/+1 |
| | |_|/
| |/| | |
|
* | | | | Merge pull request #9301 from owncloud/dont_check_external_stoage_app | Björn Schießle | 2014-06-30 | 2 | -7/+3 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | no longer check if the external storage app is enabled, we use no the webdav ... | Bjoern Schiessle | 2014-06-30 | 2 | -7/+3 |
|/ / / |
|
* | | | Merge pull request #9207 from owncloud/prevent-default-for-mail-test | Joas Schilling | 2014-06-30 | 2 | -4/+4 |
|\ \ \
| |/ /
|/| | |
|
| * | | Fix test mail behaviour | Morris Jobke | 2014-06-25 | 2 | -4/+4 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-30 | 115 | -956/+1498 |
* | | | Merge pull request #9266 from owncloud/fix_objectstore_etag_update | Thomas Müller | 2014-06-29 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | always regenerate etag when writing back file to objectstore | Jörn Friedrich Dreyer | 2014-06-27 | 1 | -1/+1 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-29 | 465 | -11164/+33397 |
* | | | | Merge pull request #9261 from owncloud/shorten_userid_columns | Morris Jobke | 2014-06-28 | 2 | -3/+3 |
|\ \ \ \ |
|
| * | | | | trigger db update | Morris Jobke | 2014-06-28 | 1 | -1/+1 |
| * | | | | shorten userid columns to 64 chars, ref #9186 | Jörn Friedrich Dreyer | 2014-06-27 | 1 | -2/+2 |
* | | | | | Merge pull request #8777 from owncloud/l10n-utils-and-defaults | Morris Jobke | 2014-06-28 | 3 | -60/+72 |
|\ \ \ \ \ |
|
| * | | | | | more strings to translate in utils also some fixes in defaults | Volkan Gezer | 2014-06-28 | 3 | -60/+72 |
* | | | | | | Merge pull request #9278 from owncloud/l10n-servershare-dialog | Volkan Gezer | 2014-06-28 | 1 | -2/+2 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | fix server share dialog title | Volkan Gezer | 2014-06-28 | 1 | -2/+2 |
* | | | | | | Merge pull request #9265 from owncloud/fix-whitespace | Morris Jobke | 2014-06-28 | 2 | -5/+5 |
|\ \ \ \ \ \ |
|
| * | | | | | | fix trailing whitespace noted by Scrutinizer | Jan-Christoph Borchardt | 2014-06-27 | 2 | -5/+5 |
* | | | | | | | Merge pull request #9020 from owncloud/l10n-external-errors-fix | Morris Jobke | 2014-06-28 | 2 | -5/+7 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | some strings to localize external mount api responses. fix #8094 | Volkan Gezer | 2014-06-12 | 2 | -5/+7 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-06-28 | 137 | -850/+926 |
| |_|/ / / / /
|/| | | | | | |
|
* | | | | | | | Merge pull request #9264 from owncloud/share-linkshareusefilesource | Björn Schießle | 2014-06-27 | 2 | -2/+148 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Unit tests for share dropdown with nested link share | Vincent Petry | 2014-06-27 | 2 | -1/+147 |
| * | | | | | | | Use file_source to find matching share for nested link shares | Vincent Petry | 2014-06-27 | 1 | -1/+1 |
| | |_|_|/ / /
| |/| | | | | |
|
* | | | | | | | normalize path before comparison to make sure that we always find the mount p... | Bjoern Schiessle | 2014-06-27 | 1 | -1/+2 |
* | | | | | | | Merge pull request #9263 from owncloud/remote-share-update | icewind1991 | 2014-06-27 | 2 | -15/+73 |
|\ \ \ \ \ \ \
| |_|_|/ / / /
|/| | | | | | |
|
| * | | | | | | Improve comment | Robin Appelman | 2014-06-27 | 1 | -1/+2 |
| * | | | | | | Fix parsing of webdav permissions | Robin Appelman | 2014-06-27 | 1 | -1/+2 |
| * | | | | | | Also check for updated permissions for webdav storages | Robin Appelman | 2014-06-27 | 2 | -17/+54 |
| * | | | | | | Use the etag to check for updates in webdav storages where available | Robin Appelman | 2014-06-27 | 1 | -0/+19 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | Merge pull request #9260 from owncloud/fileactions-lateregisterinpublicpage | Vincent Petry | 2014-06-27 | 2 | -1/+4 |
|\ \ \ \ \ \ |
|
| * | | | | | | Remove missed console.log in file list | Vincent Petry | 2014-06-27 | 1 | -1/+0 |
| * | | | | | | Allow late registration of file actions in public page | Vincent Petry | 2014-06-27 | 1 | -0/+4 |
| |/ / / / / |
|