Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge master into webdav-injection | Robin Appelman | 2014-04-25 | 9 | -257/+64 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-25 | 3 | -0/+6 |
| * | some fixes to make the gallery work, this made it necessary to adjust some te... | Bjoern Schiessle | 2014-04-23 | 2 | -207/+21 |
| * | fix encryption tests after the removal of the shared folder | Bjoern Schiessle | 2014-04-23 | 5 | -60/+46 |
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-23 | 1 | -0/+1 |
* | | Prevent error if previously cached data doesn't have an etag | Robin Appelman | 2014-04-22 | 1 | -0/+1 |
* | | merge master into webdav-injection | Robin Appelman | 2014-04-15 | 15 | -266/+224 |
|\| | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-14 | 1 | -0/+11 |
| * | Merge pull request #7807 from sarciszewski/patch-1 | Lukas Reschke | 2014-04-11 | 1 | -2/+2 |
| |\ | |||||
| | * | Update crypt.php | Scott Arciszewski | 2014-03-24 | 1 | -2/+2 |
| | * | Update crypt.php | Scott Arciszewski | 2014-03-19 | 1 | -2/+2 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-09 | 1 | -0/+13 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-06 | 1 | -0/+2 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-03 | 1 | -0/+1 |
| * | | Merge pull request #7978 from owncloud/enc_cleanup | Vincent Petry | 2014-04-02 | 1 | -45/+0 |
| |\ \ | |||||
| | * | | there is no need to re-calculate the shares after a touch | Bjoern Schiessle | 2014-03-31 | 1 | -45/+0 |
| * | | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled | Morris Jobke | 2014-04-02 | 2 | -10/+8 |
| |\ \ \ | |||||
| | * | | | always encrypt files to owner | Bjoern Schiessle | 2014-03-31 | 2 | -10/+8 |
| | |/ / | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-02 | 1 | -0/+1 |
| * | | | Merge pull request #7997 from owncloud/correct-remember-trashbin-state | Bart Visscher | 2014-04-01 | 1 | -3/+3 |
| |\ \ \ | |||||
| | * | | | Remember before change works better | Bart Visscher | 2014-04-01 | 1 | -3/+3 |
| | |/ / | |||||
| * | | | Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook | Björn Schießle | 2014-04-01 | 3 | -87/+66 |
| |\ \ \ | |||||
| | * | | | don't call getFileInfo() to avoid to open the same file twice | Bjoern Schiessle | 2014-03-31 | 1 | -12/+16 |
| | * | | | move check if a file should be encrypted to the pre hook | Bjoern Schiessle | 2014-03-31 | 2 | -75/+50 |
| * | | | | Merge pull request #7915 from owncloud/replace-personalblock | Vincent Petry | 2014-04-01 | 2 | -119/+113 |
| |\ \ \ \ | |||||
| | * \ \ \ | external storage: fix merge conflict, indentation | Jan-Christoph Borchardt | 2014-03-31 | 2 | -0/+3 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | replace personalblock fieldset with section class in files apps | Jan-Christoph Borchardt | 2014-03-27 | 2 | -119/+113 |
| | | |/ / | | |/| | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-01 | 1 | -0/+1 |
| | |/ / | |/| | | |||||
| * | | | don't write file if opening a stream to encrypt the data fails | Bjoern Schiessle | 2014-03-28 | 1 | -0/+2 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-28 | 1 | -0/+1 |
| |/ / | |||||
| * | | Miscellaneous text fixes for core apps | Robin McCorkell | 2014-03-26 | 1 | -1/+1 |
* | | | merge master into webdav-injection | Robin Appelman | 2014-03-26 | 60 | -79/+236 |
|\| | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-24 | 1 | -0/+1 |
| * | | Merge pull request #7655 from owncloud/shared-unencryptedsize | Vincent Petry | 2014-03-21 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fixed warning when browsing Shared folder | Vincent Petry | 2014-03-10 | 1 | -1/+1 |
| * | | | Merge branch 'master' into close-session-faster-master | Thomas Müller | 2014-03-19 | 2 | -0/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-19 | 2 | -0/+2 |
| * | | | Merge branch 'master' into close-session-faster-master | Thomas Müller | 2014-03-17 | 57 | -76/+198 |
| |\| | | |||||
| | * | | clearify the use-case of this app | Frank Karlitschek | 2014-03-17 | 1 | -1/+1 |
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-15 | 2 | -0/+2 |
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 3 | -0/+46 |
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 2 | -0/+2 |
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-12 | 8 | -1/+9 |
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-11 | 55 | -74/+138 |
| | |/ | |||||
| * / | in case of phpunit executions calling header() and exit() is too bad | Thomas Müller | 2014-03-14 | 1 | -3/+8 |
| |/ | |||||
| * | Return unencrypted_size of folder when queried | Vincent Petry | 2014-03-07 | 2 | -0/+27 |
* | | merge master into webdav-injection | Robin Appelman | 2014-03-06 | 6 | -32/+48 |
|\| | |||||
| * | don't create files folder, let ownCloud core handle it | Bjoern Schiessle | 2014-03-05 | 1 | -1/+0 |
| * | Merge pull request #7454 from owncloud/enc_remember_fopen_mode | Björn Schießle | 2014-02-28 | 2 | -6/+29 |
| |\ | |||||
| | * | remember original fopen access type in pre-proxy because sometimes they change | Bjoern Schiessle | 2014-02-27 | 2 | -6/+29 |