Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-name | Robin Appelman | 2014-08-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | use OC_Util::basename | Robin Appelman | 2014-01-15 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #10249 from mroi/patch-1 | Thomas Müller | 2014-08-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | file size on non-(Linux/BSD/Windows)-installations | Michael Roitzsch | 2014-08-07 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #10312 from owncloud/fix-old-japanese | Thomas Müller | 2014-08-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | fix old Japanese language code redirection | Volkan Gezer | 2014-08-09 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #10285 from owncloud/sharing_set_correct_min_date | Morris Jobke | 2014-08-11 | 2 | -5/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | update unit test, min date should be always today + 1 | Bjoern Schiessle | 2014-08-08 | 1 | -3/+5 | |
| * | | | | | | | | | | | set minDate always to today + one day | Bjoern Schiessle | 2014-08-08 | 1 | -2/+8 | |
* | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-11 | 45 | -206/+312 | |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-10 | 221 | -3345/+1595 | |
* | | | | | | | | | | | Merge pull request #10302 from owncloud/remove-logon-rejected | Lukas Reschke | 2014-08-09 | 1 | -8/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | remove confusing 'automatic logon rejected' message, fix #8591 | Jan-Christoph Borchardt | 2014-08-09 | 1 | -8/+0 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #10293 from owncloud/fix-headers-being-sent | Jan-Christoph Borchardt | 2014-08-09 | 3 | -3/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | using flush() here is pointless as we render the layout into a memory buffer ... | Thomas Müller | 2014-08-08 | 3 | -3/+0 | |
* | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-09 | 146 | -1199/+1830 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #10290 from owncloud/check_quota_on_new_via_web | Thomas Müller | 2014-08-08 | 1 | -0/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | check quota when trying to download a file via new -> web | Jörn Friedrich Dreyer | 2014-08-08 | 1 | -0/+23 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #10288 from owncloud/sharing_dont_show_share_dialog | Björn Schießle | 2014-08-08 | 2 | -18/+32 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | remove share permissions if user is excluded from sharing | Bjoern Schiessle | 2014-08-08 | 1 | -0/+10 | |
| * | | | | | | | | | only show "share with others" and "share by link" navigation bar entries if u... | Bjoern Schiessle | 2014-08-08 | 1 | -18/+22 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #10280 from owncloud/lazyloading-earlier | Morris Jobke | 2014-08-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | trigger lazy loading earlier, fix #9823 | Jan-Christoph Borchardt | 2014-08-08 | 1 | -1/+1 | |
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-08 | 194 | -1837/+1772 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #10248 from owncloud/enc_remove_keys_from_session | Morris Jobke | 2014-08-07 | 4 | -4/+19 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | add logout hook to remove keys from session | Bjoern Schiessle | 2014-08-07 | 4 | -4/+19 | |
* | | | | | | | | | | Merge pull request #9953 from owncloud/fix_text_preview_for_systems_without_ttf | Morris Jobke | 2014-08-07 | 1 | -1/+8 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | implement a txt preview fallback for the case that ttf is not support | Georg Ehrke | 2014-07-28 | 1 | -1/+8 | |
* | | | | | | | | | | | Merge pull request #10261 from owncloud/fix-9829 | Thomas Müller | 2014-08-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | ldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a u... | Arthur Schiwon | 2014-08-07 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #10172 from owncloud/fix-8802 | Morris Jobke | 2014-08-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Use human readable relative date for oc-dialog-filepickers | Tom Needham | 2014-08-07 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge pull request #10079 from owncloud/Improve_scanner_message | Thomas Müller | 2014-08-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Improved scanner error message | Martin | 2014-07-31 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge pull request #10142 from owncloud/fix-#9283-gzip_support | Thomas Müller | 2014-08-07 | 2 | -8/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Previous commit was not based on master, retry. Removed broken tar cutter, do... | Remco Brenninkmeijer | 2014-08-04 | 2 | -8/+7 | |
* | | | | | | | | | | | | | | Merge pull request #10238 from owncloud/fix-public-download-with-encryption-m... | Thomas Müller | 2014-08-07 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | we can only close the session if encryption is not used | Thomas Müller | 2014-08-07 | 1 | -1/+4 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #10184 from owncloud/getbyid-node | Robin Appelman | 2014-08-07 | 4 | -61/+159 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | trim leading slash | Robin Appelman | 2014-08-06 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Fix SharedCache::getPathById | Robin Appelman | 2014-08-06 | 2 | -21/+7 | |
| * | | | | | | | | | | | | | | return null instead of throwing an exception | Robin Appelman | 2014-08-06 | 2 | -6/+3 | |
| * | | | | | | | | | | | | | | Fix Folder::getById | Robin Appelman | 2014-08-05 | 3 | -39/+154 | |
* | | | | | | | | | | | | | | | Merge pull request #10223 from dannosaur/patch-1 | Jan-Christoph Borchardt | 2014-08-07 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | fix tiny thumbnails in public preview/share mode | Dan Jones | 2014-08-06 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | Merge pull request #10218 from owncloud/pzy-master | Thomas Müller | 2014-08-07 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Update public.php | pzy | 2014-08-07 | 1 | -0/+5 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #8915 from owncloud/MorrisJobke-travis | Thomas Müller | 2014-08-07 | 14 | -6/+367 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | execute unit test for files external in separate build config | Thomas Müller | 2014-08-05 | 1 | -0/+9 | |
| * | | | | | | | | | | | | | | Disable encryption migration tests | Morris Jobke | 2014-08-05 | 1 | -0/+8 |