summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-0220-30/+36
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-0114-4/+70
* Moving encryption_dummy to the apps repo - fixes #15950Thomas Müller2015-04-305-218/+0
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-3036-38/+16
* Merge pull request #15919 from owncloud/enc_handle_empty_filesClark Tomlinson2015-04-294-34/+118
|\
| * method shouldn't be staticBjoern Schiessle2015-04-281-1/+1
| * also create encryption keys for empty filesBjoern Schiessle2015-04-282-23/+42
| * skip update of encryption keys if file is not encryptedBjoern Schiessle2015-04-283-13/+78
* | Merge pull request #15908 from owncloud/fix-replace-with-sedVincent Petry2015-04-2910-10/+10
|\ \
| * | Replace `replace` with `sed` statementMorris Jobke2015-04-2910-10/+10
| |/
* | Merge pull request #15596 from owncloud/issue/15589Morris Jobke2015-04-292-9/+31
|\ \
| * | Add tests for the correct share id on the call aswellJoas Schilling2015-04-281-3/+15
| * | Correctly send Federate-Cloud Share Feedback against the remote share IDJoas Schilling2015-04-281-6/+6
| * | check the called URLJoas Schilling2015-04-281-3/+13
| * | Correctly generate the feedback URL for remote shareJoas Schilling2015-04-281-1/+1
| |/
* | Merge pull request #15911 from owncloud/enc_create_header_for_new_keyBjörn Schießle2015-04-292-3/+14
|\ \
| * | make sure that we create a header for the encrypted private keyBjoern Schiessle2015-04-282-3/+14
| |/
* | Merge pull request #15706 from owncloud/fix-15705-masterLukas Reschke2015-04-292-3/+6
|\ \
| * | move creation of shared key to the login handler - fixes #15705Thomas Müller2015-04-172-3/+6
* | | Merge pull request #15921 from cmeh/patch-4Thomas Müller2015-04-291-1/+1
|\ \ \
| * | | Update wizardTabElementary.jscmeh2015-04-281-1/+1
| | |/ | |/|
* / | [tx-robot] updated from transifexJenkins for ownCloud2015-04-294-108/+108
|/ /
* | Merge pull request #14764 from owncloud/shared-etag-propagateMorris Jobke2015-04-2822-216/+936
|\ \
| * | dont pass floats as timestamp to the changepropagatorRobin Appelman2015-04-271-1/+1
| * | safer teardownRobin Appelman2015-04-271-1/+3
| * | use microtime to prevent race conditionsRobin Appelman2015-04-271-3/+3
| * | cleanup hooksRobin Appelman2015-04-271-0/+7
| * | triger propagation for webdav uploadsRobin Appelman2015-04-271-3/+3
| * | fix mergeRobin Appelman2015-04-274-116/+76
| * | fix propagation when renaming a directly reshared folderRobin Appelman2015-04-271-2/+4
| * | minor fixesRobin Appelman2015-04-274-10/+10
| * | add rename hook for propagationRobin Appelman2015-04-272-0/+16
| * | propagate changes up resharesRobin Appelman2015-04-271-0/+10
| * | Make sure the owner mountpoints are setupRobin Appelman2015-04-272-1/+5
| * | more propagation testsRobin Appelman2015-04-274-245/+429
| * | remove duplicates from rebaseRobin Appelman2015-04-271-48/+0
| * | adjust testRobin Appelman2015-04-272-2/+7
| * | dont use our now non existing hookRobin Appelman2015-04-272-2/+6
| * | propagate etags for all user of a shareRobin Appelman2015-04-2713-93/+509
| * | Allow getting *all* share entries owned by a userRobin Appelman2015-04-271-1/+3
| * | unit test for etag propagation across shared storage boundaryRobin Appelman2015-04-271-2/+158
* | | Merge pull request #15773 from owncloud/fix-15766Thomas Müller2015-04-282-13/+25
|\ \ \
| * | | save configs when requesting a config ID. They are empty, but avoid configID ...Arthur Schiwon2015-04-211-2/+2
| * | | LDAP Wizard: have always-increasing 'nth Server' number per full page load, f...Arthur Schiwon2015-04-211-11/+23
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-284-0/+4
* | | | Fix file name validation in New menuVincent Petry2015-04-272-10/+61
* | | | Merge pull request #15860 from owncloud/enc_fallback_old_encryptionThomas Müller2015-04-274-4/+49
|\ \ \ \ | |_|/ / |/| | |
| * | | fall back to the ownCloud default encryption module and aes128 if we read a e...Bjoern Schiessle2015-04-274-4/+49
* | | | Fix module registrationJoas Schilling2015-04-271-1/+3
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-2712-0/+62