summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-034-0/+4
* Merge pull request #24394 from owncloud/cleanup_share_classmapRoeland Douma2016-05-037-19/+11
|\
| * Cleanup Files_Sharing CLASSPATHRoeland Jago Douma2016-05-027-19/+11
* | Move activity manager to the namespaceJoas Schilling2016-05-021-2/+2
|/
* Merge pull request #24238 from owncloud/caldav-test-event-in-far-futureJoas Schilling2016-05-023-4/+8
|\
| * firstoccurence and lastoccurence have a length now - triggering BIGINT on pos...Thomas Müller2016-04-292-1/+3
| * Test an event in the far future - refs #24221Thomas Müller2016-04-291-3/+5
* | Merge pull request #24376 from owncloud/remove_dead_codeRoeland Douma2016-05-021-15/+0
|\ \
| * | Remove dead codeRoeland Jago Douma2016-05-021-15/+0
* | | Merge pull request #24341 from owncloud/scan-nfd-showwarningMorris Jobke2016-05-022-2/+19
|\ \ \
| * | | Fix SMB storage to not normalize UTF8Vincent Petry2016-04-291-1/+1
| * | | Add files:scan warning when NFD or incompatible encoding foundVincent Petry2016-04-291-1/+18
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0210-0/+22
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2016-05-0118-24/+116
* | There is no need to do old etag propagationRoeland Jago Douma2016-04-302-101/+0
* | [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.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
|\ \
| * | 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 en...Bjoern Schiessle2016-04-263-24/+78
| |/
* | [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 messagesRoeland Jago Douma2016-04-254-63/+94
* | [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 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 queryRobin Appelman2016-04-252-2/+1
| |/ /
* | | Merge pull request #24244 from owncloud/mount-uniqueVincent Petry2016-04-252-2/+22
|\ \ \ | |/ / |/| |
| * | 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 conditionsMorris Jobke2016-04-206-48/+32
* | | | Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statementThomas Müller2016-04-251-0/+1
|\ \ \ \
| * | | | 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 ..."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 resourceArthur Schiwon2016-04-222-11/+3
* | | | | 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 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
|\ \ \ | |/ / |/| |
| * | 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
|\ \ \