summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Add locking to modifying operation of the OCS Share APIRoeland Jago Douma2016-04-302-39/+175
| | | | | | | | | | Fixes #17243 This is done in the OCS Share API instead of the share manager since we want lazy shares in general. However when doing modifying calls via the OCS Share API it is fine to force real nodes. * Updated unit tests to work with logging
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-3014-20/+26
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-2916-0/+110
|
* Merge pull request #24287 from owncloud/smb-110Vincent Petry2016-04-288-41/+122
|\ | | | | update icewind/streams to 1.1.0
| * update icewind/streams to 1.1.0Robin Appelman2016-04-268-41/+122
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2820-0/+180
| |
* | Merge pull request #22777 from owncloud/encrypt_all_master_keyThomas Müller2016-04-274-29/+116
|\ \ | | | | | | improved encrypt-all script
| * | if we don't have a encrypted file key we can return a empty string right awayBjoern Schiessle2016-04-262-5/+38
| | |
| * | don't create a private-/public-key pair for each user if the master key is ↵Bjoern Schiessle2016-04-263-24/+78
| |/ | | | | | | enabled
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2734-2/+92
| |
* | Merge pull request #24027 from owncloud/translate_ocs_shareThomas Müller2016-04-264-63/+94
|\ \ | |/ |/| Translate OCS Share API error messages
| * Translate OCS Share API error messagesRoeland Jago Douma2016-04-254-63/+94
| | | | | | | | For https://github.com/owncloud/core/issues/22209
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-26192-1076/+1160
| |
* | Merge pull request #23726 from owncloud/ldap-wizard-improve-status-indicatorThomas Müller2016-04-251-0/+11
|\ \ | | | | | | LDAP Wizard: reset connection status indicator when switching LDAP co…
| * | LDAP Wizard: reset connection status indicator when switching LDAP configArthur Schiwon2016-04-251-0/+11
| | |
* | | Merge pull request #22648 from owncloud/propagate-singleThomas Müller2016-04-252-2/+1
|\ \ \ | | | | | | | | do propagation in a single query
| * | | do propagation in a single queryRobin Appelman2016-04-252-2/+1
| |/ /
* | | Merge pull request #24244 from owncloud/mount-uniqueVincent Petry2016-04-252-2/+22
|\ \ \ | |/ / |/| | don't get the config for the same mount multiple times
| * | add testRobin Appelman2016-04-251-0/+11
| | |
| * | don't get the config for the same mount multiple timesRobin Appelman2016-04-251-2/+11
| | |
* | | Merge pull request #24052 from owncloud/fix-ldap-cache-race-conditionsThomas Müller2016-04-256-48/+32
|\ \ \ | | | | | | | | Fix LDAP race conditions
| * | | Fix LDAP race conditionsMorris Jobke2016-04-206-48/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * getFromCache is wrapped in isCached * inbetween the two calls the cache entry hits it's TTL * getFromCache returns null * this fix only checkes if the returned value is null and return only non-null values
* | | | Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statementThomas Müller2016-04-251-0/+1
|\ \ \ \ | | | | | | | | | | Add missing use statement
| * | | | Add missing use statementJoas Schilling2016-04-251-0/+1
| | | | |
* | | | | Merge pull request #24230 from owncloud/you-form-of-activitiesLukas Reschke2016-04-251-0/+35
|\ \ \ \ \ | |_|_|/ / |/| | | | Translate the current user with "You ..."
| * | | | Translate the current user with "You ..."Joas Schilling2016-04-251-0/+35
| |/ / /
* | | | Merge pull request #24214 from owncloud/fix-ldap-connection-unbind-on-loginVincent Petry2016-04-252-11/+3
|\ \ \ \ | | | | | | | | | | on clone Connection, do not take over the existing LDAP resource
| * | | | on clone Connection, do not take over the existing LDAP resourceArthur Schiwon2016-04-222-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For one, it solves potential conflicts when using the resource. For the other, one on the login check (the only place where a clone happens currently) we do not need to rebind after confirming the user's login was successful.
* | | | | Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_appBjörn Schießle2016-04-2529-51/+259
|\ \ \ \ \ | |_|/ / / |/| | | | move federated sharing settings to the federatedfilesharing app
| * | | | move federated sharing settings to the federatedfilesharing appBjörn Schießle2016-04-2229-51/+259
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-252-2/+2
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2436-14/+136
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2312-0/+28
| |/ / |/| |
* | | Merge pull request #24124 from owncloud/encryped-size-progationThomas Müller2016-04-222-14/+68
|\ \ \ | |/ / |/| | dont do optimized size propagation for encrypted files
| * | Add unit tests for shared size propagation with encryptionRobin Appelman2016-04-212-14/+68
| | |
* | | Merge pull request #23918 from owncloud/cruds-for-federated-sharesBjörn Schießle2016-04-225-43/+115
|\ \ \ | | | | | | | | bring back CRUDS permissions for federated shares
| * | | ask for share-permissions on propfindBjörn Schießle2016-04-201-0/+16
| | | |
| * | | return correct share permissions on propfindBjörn Schießle2016-04-183-40/+88
| | | |
| * | | set correct permissions in shareinfoBjörn Schießle2016-04-181-3/+11
| | |/ | |/|
* | | Merge pull request #24151 from owncloud/create-personal-calendarThomas Müller2016-04-222-1/+83
|\ \ \ | | | | | | | | Personal calendar should be generated even if the birthday calendar a…
| * | | Personal calendar should be generated even if the birthday calendar already ↵Thomas Müller2016-04-212-1/+83
| | |/ | |/| | | | | | | exists - fixes #24082
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2216-0/+16
| | |
* | | Merge pull request #24157 from ↵Thomas Müller2016-04-211-6/+9
|\ \ \ | | | | | | | | | | | | | | | | owncloud/files-app-is-not-available-on-public-page OCA.Files.App is not available on public page
| * | | OCA.Files.App is not available on public pageChristoph Wurst2016-04-211-6/+9
| |/ /
* | | Merge pull request #24155 from owncloud/fix-birthday_calendar-aclThomas Müller2016-04-214-8/+27
|\ \ \ | | | | | | | | Birthday calendar should never have write acl
| * | | Birthday calendar should never have write acl - fixes #24154Thomas Müller2016-04-214-8/+27
| |/ /
* | | Merge pull request #24111 from owncloud/chunk-users-in-background-jobsBjörn Schießle2016-04-213-56/+24
|\ \ \ | |/ / |/| | Chunk the users correctly in the trashbin and versions background job
| * | Chunk the users correctly in the trashbin and versions background jobJoas Schilling2016-04-203-56/+24
| | |
* | | Merge pull request #22791 from owncloud/enc_master_key_improvementsVincent Petry2016-04-216-74/+117
|\ \ \ | | | | | | | | Enc master key improvements
| * | | replaceUserKeys() actually deletes the users keys -> update method name and ↵Bjoern Schiessle2016-03-183-3/+5
| | | | | | | | | | | | | | | | doc-block
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 04:29:10 +0000