summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10396 from owncloud/kill-filesyncThomas Müller2014-08-132-65/+0
|\ | | | | Kill filesync.php in files/appinfo
| * Kill filesync.php in files/appinfoMorris Jobke2014-08-132-65/+0
| | | | | | | | * ref comment: https://github.com/owncloud/core/issues/10392#issuecomment-52050567
* | Cast file id's to int so we can compare them properlyRobin Appelman2014-08-131-2/+2
|/
* Merge pull request #9754 from owncloud/enc_support_aes_256Vincent Petry2014-08-1314-167/+498
|\ | | | | [encryption] support aes 256
| * add unit test for aes256/aes128Bjoern Schiessle2014-07-232-0/+192
| |
| * update existing unit testsBjoern Schiessle2014-07-235-127/+16
| |
| * support aes 256Bjoern Schiessle2014-07-2310-84/+334
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-1312-8/+62
| |
* | fixes from git push forceMorris Jobke2014-08-121-2/+0
| |
* | add unit testsBjoern Schiessle2014-08-121-0/+49
| |
* | fix detection of system wide mount pointsBjoern Schiessle2014-08-121-8/+33
| |
* | Merge pull request #10357 from owncloud/l10n-alert-fixVolkan Gezer2014-08-121-1/+1
|\ \ | | | | | | Fix alert text
| * | Fix alert textVolkan Gezer2014-08-121-1/+1
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-1217-14/+3
|/ /
* | Transifex suggestion by mnestisVolkan Gezer2014-08-111-1/+1
| |
* | Merge pull request #9848 from dupondje/masterblizzz2014-08-111-12/+18
|\ \ | | | | | | Fix memberOf detection. Fixes: #9835
| * | Fix initializing in #9848Jean-Louis Dupond2014-08-111-0/+1
| | |
| * | Fix remarks in #9848Jean-Louis Dupond2014-08-111-11/+13
| | |
| * | Fix memberOf detection. Fixes: #9835Jean-Louis Dupond2014-07-241-7/+10
| | |
* | | Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-nameRobin Appelman2014-08-111-1/+1
|\ \ \ | | | | | | | | use OC_Util::basename
| * | | use OC_Util::basenameRobin Appelman2014-01-151-1/+1
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-1110-2/+17
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-1016-0/+20
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-099-2/+53
| | | |
* | | | Merge pull request #10290 from owncloud/check_quota_on_new_via_webThomas Müller2014-08-081-0/+23
|\ \ \ \ | | | | | | | | | | check quota when trying to download a file via new -> web
| * | | | check quota when trying to download a file via new -> webJörn Friedrich Dreyer2014-08-081-0/+23
| | | | |
* | | | | only show "share with others" and "share by link" navigation bar entries if ↵Bjoern Schiessle2014-08-081-18/+22
|/ / / / | | | | | | | | | | | | user is allowed to share files
* | | | Merge pull request #10280 from owncloud/lazyloading-earlierMorris Jobke2014-08-081-1/+1
|\ \ \ \ | | | | | | | | | | trigger lazy loading earlier, fix #9823
| * | | | trigger lazy loading earlier, fix #9823Jan-Christoph Borchardt2014-08-081-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0842-79/+1
|/ / / /
* | | | Merge pull request #10248 from owncloud/enc_remove_keys_from_sessionMorris Jobke2014-08-074-4/+19
|\ \ \ \ | | | | | | | | | | add logout hook to remove keys from session
| * | | | add logout hook to remove keys from sessionBjoern Schiessle2014-08-074-4/+19
| | | | |
* | | | | Merge pull request #10261 from owncloud/fix-9829Thomas Müller2014-08-071-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 Schiwon2014-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | unexisting function, fixes #9829
* | | | | | Merge pull request #10238 from ↵Thomas Müller2014-08-071-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 usedThomas Müller2014-08-071-1/+4
| |/ / / / /
* | | | | | Merge pull request #10184 from owncloud/getbyid-nodeRobin Appelman2014-08-071-19/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix Folder::getById
| * | | | | | trim leading slashRobin Appelman2014-08-061-1/+1
| | | | | | |
| * | | | | | Fix SharedCache::getPathByIdRobin Appelman2014-08-061-20/+6
| | | | | | |
* | | | | | | Merge pull request #10223 from dannosaur/patch-1Jan-Christoph Borchardt2014-08-071-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix tiny thumbnails in public preview/share mode
| * | | | | | | fix tiny thumbnails in public preview/share modeDan Jones2014-08-061-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #10218 from owncloud/pzy-masterThomas Müller2014-08-071-0/+5
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Adding link tag to enable facebook timeline previews
| * | | | | | | Update public.phppzy2014-08-071-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-travisThomas Müller2014-08-074-3/+62
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Travis support for PRs and master, stable5 and stable6
| * | | | | | Disable encryption migration testsMorris Jobke2014-08-051-0/+8
| | | | | | |
| * | | | | | mark tests as skipped - TODO travisMorris Jobke2014-08-051-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * swift causes some timeouts and test failures
| * | | | | | Minor fixesMorris Jobke2014-08-052-3/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * instanceof \OC\Files\View * fix misplaced paranthesis * remove misplaced character in comment
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-073-5/+5
| |/ / / / |/| | | |
* | | | | Merge pull request #10186 from owncloud/versioning_fix_pathThomas Müller2014-08-062-2/+36
|\ \ \ \ \ | | | | | | | | | | | | [versioning] make sure that getVersions() return the correct path
| * | | | | add unit test to make sure getVersions returns the correct resultBjoern Schiessle2014-08-051-0/+34
| | | | | |