summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove test codeThomas Müller2013-10-161-4/+0
* Merge branch 'master' into activities-apiThomas Müller2013-10-16990-21642/+19802
|\
| * Merge pull request #5353 from owncloud/files-dndtodirbrokenMorris Jobke2013-10-161-14/+22
| |\
| | * Fixed drag and drop upload to breadcrumbVincent Petry2013-10-151-26/+22
| | * Fixed drag and drop onto foldersVincent Petry2013-10-151-5/+17
| * | Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backendThomas Müller2013-10-161-5/+1
| |\ \
| | * | there shall be tabsThomas Müller2013-10-141-1/+1
| | * | file system is now initialized with apache authentication as wellThomas Müller2013-10-141-6/+2
| * | | Merge pull request #5329 from owncloud/enc_fix_unencrypted_sizeBjörn Schießle2013-10-161-2/+19
| |\ \ \
| | * | | revert last changesBjoern Schiessle2013-10-161-3/+1
| | * | | added another test, if unencrypted size and encrypted size are equal we can a...Bjoern Schiessle2013-10-151-1/+3
| | * | | fix array keyBjoern Schiessle2013-10-141-1/+1
| | * | | try to fix unencrypted file size if it doesn't look plausibleBjoern Schiessle2013-10-141-2/+19
| | |/ /
| * | | Merge pull request #5354 from owncloud/enc_testsMorris Jobke2013-10-161-216/+106
| |\ \ \
| | * | | fix commentBjoern Schiessle2013-10-151-1/+1
| | * | | added simple test for getFileSize proxyBjoern Schiessle2013-10-151-216/+106
| * | | | 6.0 alpha 2v6.0.0alpha2Frank Karlitschek2013-10-161-2/+2
| * | | | Merge pull request #5333 from owncloud/avater_with_encryptionBjörn Schießle2013-10-162-6/+1
| |\ \ \ \
| | * | | | Fix avatar unittestkondou2013-10-151-1/+1
| | * | | | Merge branch 'master' into avater_with_encryptionBjoern Schiessle2013-10-1512-40/+135
| | |\| | |
| | * | | | test should work nowBjoern Schiessle2013-10-151-1/+0
| | * | | | avatars should also work with encryption after pr #5332 was mergedBjoern Schiessle2013-10-141-4/+0
| | | |/ / | | |/| |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-16387-3453/+3676
| * | | | Merge pull request #5334 from owncloud/files-sharing-actionsafteruploadMorris Jobke2013-10-153-23/+29
| |\ \ \ \
| | * | | | Disabled ajax mode for public files viewVincent Petry2013-10-142-21/+27
| | * | | | Fixed file permissions after public uploadVincent Petry2013-10-141-2/+2
| * | | | | Merge pull request #5350 from owncloud/files-preventdeletemountpointVincent Petry2013-10-151-1/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Prevent renaming/deleting mount pointsVincent Petry2013-10-151-1/+2
| |/ / / /
| * | | | Merge pull request #5295 from owncloud/show-eye-in-personalRaghu Nayyar2013-10-152-10/+6
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Removes Bogus showpassword js. thx @PVince81raghunayyar2013-10-151-3/+1
| | * | | Should Display PasswordToggle Eye Everywhere.raghunayyar2013-10-152-8/+1
| | * | | Shows The Eye permanently in the Confirm Password field in Personal Settings ...raghunayyar2013-10-122-1/+6
| * | | | Merge pull request #5332 from owncloud/enc_run_proxy_only_for_filesMorris Jobke2013-10-151-1/+2
| |\ \ \ \
| | * | | | check if we are writing to user/files, otherwise skip encryptionBjoern Schiessle2013-10-141-1/+2
| | | |_|/ | | |/| |
| * | | | Merge pull request #5269 from owncloud/ocs_share_api_add_received_fromBjörn Schießle2013-10-152-8/+20
| |\ \ \ \
| | * | | | fix api testsBjoern Schiessle2013-10-111-1/+2
| | * | | | add "received_from" and "received_from_displayname" field in case of a reshar...Bjoern Schiessle2013-10-101-7/+18
| * | | | | Merge pull request #5341 from owncloud/fix-logout-link-htmlVincent Petry2013-10-151-1/+1
| |\ \ \ \ \
| | * | | | | Fix logout link HTML.Andreas Fischer2013-10-141-1/+1
| * | | | | | Merge pull request #5340 from owncloud/fixing-5251-mastericewind19912013-10-142-2/+36
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | streamCopy() should return proper structure.Thomas Müller2013-10-142-2/+36
| * | | | | | Merge pull request #5330 from owncloud/files-removedfileactionsbkgVincent Petry2013-10-141-8/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Removed extra bkg color on file actions when row is selected/hovered onVincent Petry2013-10-141-8/+0
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #4867 from owncloud/fixing-4546-masterThomas Müller2013-10-144-19/+75
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into fixing-4546-masterThomas Müller2013-10-14876-19982/+21779
| | |\ \ \ \ \
| | * | | | | | moving createFileChunked() to OC_Connector_Sabre_FileThomas Müller2013-10-071-15/+34
| | * | | | | | Merge branch 'master' into fixing-4546-masterThomas Müller2013-10-071186-20283/+36964
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into fixing-4546-masterThomas Müller2013-09-304-13/+199
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into fixing-4546-masterThomas Müller2013-09-30743-13928/+33242
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | adding detection of aborted uploadsThomas Müller2013-09-161-41/+58
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-23 18:56:11 +0000