| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | * | 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 |
| |\ \ | |/ |/| | don't show share dialog and navigation entry if sharing was disabled for the user | ||||
| | * | 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 ↵ | Bjoern Schiessle | 2014-08-08 | 1 | -18/+22 |
| |/ | | | | user is allowed to share files | ||||
| * | Merge pull request #10280 from owncloud/lazyloading-earlier | Morris Jobke | 2014-08-08 | 1 | -1/+1 |
| |\ | | | | | trigger lazy loading earlier, fix #9823 | ||||
| | * | 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 | ||||
| | * | 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 | ||||
| | * | | 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 t... | ||||
| | * | | | ldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a ↵ | Arthur Schiwon | 2014-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | unexisting function, fixes #9829 | ||||
| * | | | | Merge pull request #10172 from owncloud/fix-8802 | Morris Jobke | 2014-08-07 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Use relative, human readable dates in OC.filePickers - Fixes #8802 | ||||
| | * | | | | 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 | ||||
| | * | | | | | 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 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Removed broken tar cutter, added tar and fixed extension switch. | ||||
| | * | | | | | | Previous commit was not based on master, retry. Removed broken tar cutter, ↵ | Remco Brenninkmeijer | 2014-08-04 | 2 | -8/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | double extensions are not possible in temp files. Added tar support. Fixed extension switch. | ||||
| * | | | | | | | Merge pull request #10238 from ↵ | Thomas Müller | 2014-08-07 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix-public-download-with-encryption-master we can only close the session if encryption is not used | ||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix Folder::getById | ||||
| | * | | | | | | | 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 | ||||
| | * | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | Adding link tag to enable facebook timeline previews | ||||
| | * | | | | | | | | Update public.php | pzy | 2014-08-07 | 1 | -0/+5 |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added tag to make facebook load a preview picture Update public.php add check ifMimeSupported and put the thumbsize in a variable generate preview for all supported mimes | ||||
| * | | | | | | | | Merge pull request #8915 from owncloud/MorrisJobke-travis | Thomas Müller | 2014-08-07 | 14 | -6/+367 |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Travis support for PRs and master, stable5 and stable6 | ||||
| | * | | | | | | | 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 |
| | | | | | | | | | |||||
| | * | | | | | | | mark tests as skipped - TODO travis | Morris Jobke | 2014-08-05 | 3 | -0/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * swift causes some timeouts and test failures | ||||
| | * | | | | | | | Minor fixes | Morris Jobke | 2014-08-05 | 5 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * instanceof \OC\Files\View * fix misplaced paranthesis * remove misplaced character in comment | ||||
| | * | | | | | | | Make View->shouldEmitHooks more robust | Robin Appelman | 2014-08-05 | 1 | -0/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Don't rely on the sorting the database gives us for tests | Robin Appelman | 2014-08-05 | 2 | -5/+12 |
| | | | | | | | | | |||||
| | * | | | | | | | Travis support | Morris Jobke | 2014-08-05 | 5 | -0/+267 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * use PHPUnit 4.x * force php memory limit on travis to 1024MB * create script for travis * whitelist branches master, stable5 and stable6 on travis (and PRs) * sqlplus64 * conditional JS tests and ocular temporal removal * enable scrutinizer code coverage * move oracle to top to decrease overall test duration | ||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-07 | 152 | -1067/+1060 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #10224 from owncloud/typo-fix | Morris Jobke | 2014-08-07 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | typo fix from transifex suggestion | ||||
| | * | | | | | | | typo fix from transifex suggestion | Volkan Gezer | 2014-08-06 | 1 | -2/+2 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #10144 from owncloud/issue/9972 | Thomas Müller | 2014-08-06 | 4 | -4/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Issue/9972 Fix issues with group and username `0` | ||||
| | * | | | | | | | Fix isLoggedIn() check for user '0' | Joas Schilling | 2014-08-04 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #9972 | ||||
| | * | | | | | | | Fix getting group '0' from database backend | Joas Schilling | 2014-08-04 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #9972 | ||||
| * | | | | | | | | Merge pull request #10186 from owncloud/versioning_fix_path | Thomas Müller | 2014-08-06 | 2 | -2/+36 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [versioning] make sure that getVersions() return the correct path | ||||
| | * | | | | | | | | add unit test to make sure getVersions returns the correct result | Bjoern Schiessle | 2014-08-05 | 1 | -0/+34 |
| | | | | | | | | | | |||||
| | * | | | | | | | | make sure that the versions array contains the correct path | Bjoern Schiessle | 2014-08-05 | 1 | -2/+2 |
| | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-06 | 37 | -174/+199 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #10191 from owncloud/sharing_rm_trailing_slash | Morris Jobke | 2014-08-05 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [sharing] remove trailing slash | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |