Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add unit tests | Bjoern Schiessle | 2014-08-12 | 1 | -0/+49 |
| | |||||
* | fix detection of system wide mount points | Bjoern Schiessle | 2014-08-12 | 1 | -8/+33 |
| | |||||
* | Merge pull request #10357 from owncloud/l10n-alert-fix | Volkan Gezer | 2014-08-12 | 1 | -1/+1 |
|\ | | | | | Fix alert text | ||||
| * | Fix alert text | Volkan Gezer | 2014-08-12 | 1 | -1/+1 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-12 | 17 | -14/+3 |
|/ | |||||
* | Transifex suggestion by mnestis | Volkan Gezer | 2014-08-11 | 1 | -1/+1 |
| | |||||
* | Merge pull request #9848 from dupondje/master | blizzz | 2014-08-11 | 1 | -12/+18 |
|\ | | | | | Fix memberOf detection. Fixes: #9835 | ||||
| * | Fix initializing in #9848 | Jean-Louis Dupond | 2014-08-11 | 1 | -0/+1 |
| | | |||||
| * | Fix remarks in #9848 | Jean-Louis Dupond | 2014-08-11 | 1 | -11/+13 |
| | | |||||
| * | Fix memberOf detection. Fixes: #9835 | Jean-Louis Dupond | 2014-07-24 | 1 | -7/+10 |
| | | |||||
* | | Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-name | Robin Appelman | 2014-08-11 | 1 | -1/+1 |
|\ \ | | | | | | | use OC_Util::basename | ||||
| * | | use OC_Util::basename | Robin Appelman | 2014-01-15 | 1 | -1/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-11 | 10 | -2/+17 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-10 | 16 | -0/+20 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-09 | 9 | -2/+53 |
| | | | |||||
* | | | 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 |
| | | | | |||||
* | | | | 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 | 42 | -79/+1 |
|/ / / | |||||
* | | | 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 #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 #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 | 1 | -19/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix Folder::getById | ||||
| * | | | | | trim leading slash | Robin Appelman | 2014-08-06 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix SharedCache::getPathById | Robin Appelman | 2014-08-06 | 1 | -20/+6 |
| | | | | | | |||||
* | | | | | | 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 | 4 | -3/+62 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Travis support for PRs and master, stable5 and stable6 | ||||
| * | | | | | Disable encryption migration tests | Morris Jobke | 2014-08-05 | 1 | -0/+8 |
| | | | | | | |||||
| * | | | | | mark tests as skipped - TODO travis | Morris Jobke | 2014-08-05 | 1 | -0/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | * swift causes some timeouts and test failures | ||||
| * | | | | | Minor fixes | Morris Jobke | 2014-08-05 | 2 | -3/+5 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | * instanceof \OC\Files\View * fix misplaced paranthesis * remove misplaced character in comment | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-07 | 3 | -5/+5 |
| |/ / / |/| | | | |||||
* | | | | 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 |
| | | | | | |||||
* | | | | | Merge pull request #10191 from owncloud/sharing_rm_trailing_slash | Morris Jobke | 2014-08-05 | 1 | -1/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | [sharing] remove trailing slash | ||||
| * | | | | remove unused variable | Bjoern Schiessle | 2014-08-05 | 1 | -1/+0 |
| |/ / / | |||||
* | | | | Merge pull request #10168 from ↵ | Morris Jobke | 2014-08-05 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/parallel-download-on-public-shared-folder-master close session right before the download starts - this enables parallel d... | ||||
| * | | | | close session right before the download starts - this enables parallel downloads | Thomas Müller | 2014-08-05 | 1 | -0/+1 |
| |/ / / | |||||
* / / / | Hack to avoid Agent DN + Password being overwritten by some ugly browsers ↵ | Arthur Schiwon | 2014-08-05 | 2 | -0/+12 |
|/ / / | | | | | | | | | | | | | | | | | | | with stored site credentials Conflicts: apps/user_ldap/css/settings.css | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-05 | 1 | -2/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-04 | 1 | -0/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-02 | 5 | -3/+6 |
| | | |