summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missingBjörn Schießle2013-10-115-22/+57
|\
| * fix another typoBjoern Schiessle2013-10-111-1/+1
| * change error code to 403Bjoern Schiessle2013-10-111-1/+1
| * fix typo in error message and change error code to 403Bjoern Schiessle2013-10-111-2/+2
| * block file access if share keys are missingBjoern Schiessle2013-10-115-20/+55
* | Fixed IE8 misaligned dateVincent Petry2013-10-111-4/+0
|/
* Merge pull request #5233 from owncloud/enc_filter_usersBjörn Schießle2013-10-114-33/+7
|\
| * don't cache if the encryption is enabled, this can lead to problems during un...Bjoern Schiessle2013-10-101-27/+1
| * make sure that we are logged in ad user1 while performing the testsBjoern Schiessle2013-10-101-3/+4
| * only encrypt file to users with encryption keysBjoern Schiessle2013-10-092-3/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-10169-464/+132
* | Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbrokenMorris Jobke2013-10-101-1/+1
|\ \
| * | Fixed files view regular file actions in IE8Vincent Petry2013-10-101-1/+1
* | | Merge pull request #5182 from owncloud/fix-sharring-with-password-screenMorris Jobke2013-10-103-2/+33
|\ \ \
| * | | Fix password screen for public sharesMorris Jobke2013-10-073-2/+33
* | | | Merge pull request #5114 from owncloud/ldap_uuid_attr_groupsblizzz2013-10-106-152/+107
|\ \ \ \
| * | | | LDAP: allow different UUID attributes for groups and usersArthur Schiwon2013-10-046-152/+107
* | | | | Merge pull request #5221 from owncloud/fixing-5217-masterVicDeo2013-10-101-2/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | php 5.3 compatibility for Test_Files_Sharing_ApiThomas Müller2013-10-081-2/+4
* | | | | Merge pull request #5134 from owncloud/trashbin-homeiconbrokenVincent Petry2013-10-091-3/+6
|\ \ \ \ \
| * | | | | Do not call changeDirectory() when no dir set on breadcrumbVincent Petry2013-10-041-3/+6
* | | | | | Merge pull request #5230 from owncloud/trashbin_fixesBjörn Schießle2013-10-093-149/+128
|\ \ \ \ \ \
| * | | | | | update file summary after group delete/restoreBjoern Schiessle2013-10-091-0/+2
| * | | | | | fix checkboxBjoern Schiessle2013-10-091-37/+15
| * | | | | | fix indentionBjoern Schiessle2013-10-091-99/+99
| * | | | | | fix group delete/restoreBjoern Schiessle2013-10-092-19/+18
| * | | | | | fix delete/restore individual filesBjoern Schiessle2013-10-091-26/+23
| * | | | | | fix trashbin layoutBjoern Schiessle2013-10-091-0/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #5070 from owncloud/smb-streamwrapper-fixesThomas Müller2013-10-093-15/+40
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | extend test caseRobin Appelman2013-10-021-0/+1
| * | | | | fix recursive delete for smbRobin Appelman2013-10-011-0/+8
| * | | | | fix using touch to create a file for smbRobin Appelman2013-10-011-12/+16
| * | | | | return the correct result when doing an smb renameRobin Appelman2013-10-012-2/+9
| * | | | | fix smb streamwrapper on non existing filesRobin Appelman2013-10-011-1/+6
* | | | | | Added filesApp flag as input field for files app detectionVincent Petry2013-10-082-0/+2
| |_|/ / / |/| | | |
* | | | | fix escapingMorris Jobke2013-10-081-1/+1
* | | | | make sure that we only remove file/folder sharesBjoern Schiessle2013-10-082-3/+3
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-083-2/+12
* | | | | Merge pull request #5184 from owncloud/fix-trash-bin-buttonVicDeo2013-10-071-2/+4
|\ \ \ \ \
| * | | | | Fix trash bin buttonMorris Jobke2013-10-071-2/+4
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-076-0/+28
|/ / / / /
* | | | | Merge pull request #5178 from owncloud/sharing-ispublicflagintemplateVincent Petry2013-10-071-0/+1
|\ \ \ \ \
| * | | | | Added isPublic flag in files_sharing templateVincent Petry2013-10-071-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4921 from owncloud/file_conflicts_dialog_fixesVicDeo2013-10-075-41/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove double uri encodingJörn Friedrich Dreyer2013-10-071-4/+4
| * | | | canceling individual uploads is currently impossible because there is no plac...Jörn Friedrich Dreyer2013-10-072-34/+1
| * | | | remove obsolete commentJörn Friedrich Dreyer2013-10-071-2/+0
| * | | | use !== comparisonJörn Friedrich Dreyer2013-10-071-1/+1
* | | | | Merge pull request #5165 from owncloud/files-dropontobreadcrumbfixMorris Jobke2013-10-071-6/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix breadcrumb to reinit dnd after ajax nav #5064Vincent Petry2013-10-071-6/+8
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-25 12:39:09 +0000