Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | external storage: change confusing 'applicable' to 'available for' | Jan-Christoph Borchardt | 2014-04-01 | 1 | -1/+1 |
* | 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 #7943 from hjort/master | Vincent Petry | 2014-04-01 | 1 | -3/+3 |
|\ \ | |||||
| * | | Correction: failure on sharing when user ID was prefixed by zero | Rodrigo Hjort | 2014-03-28 | 1 | -3/+3 |
* | | | Merge pull request #7975 from owncloud/fix-7973-master-2 | Vincent Petry | 2014-04-01 | 15 | -2569/+0 |
|\ \ \ | |||||
| * | | | remove pl_PL - fixes #7973 | Thomas Müller | 2014-03-31 | 15 | -2569/+0 |
* | | | | Merge pull request #7915 from owncloud/replace-personalblock | Vincent Petry | 2014-04-01 | 11 | -430/+407 |
|\ \ \ \ | |||||
| * \ \ \ | external storage: fix merge conflict, indentation | Jan-Christoph Borchardt | 2014-03-31 | 119 | -2126/+3046 |
| |\ \ \ \ | |||||
| * | | | | | replace last personalblock fieldset within files_external | Jan-Christoph Borchardt | 2014-03-31 | 1 | -3/+1 |
| * | | | | | remove CSS rules for personalblock, remove it from core | Jan-Christoph Borchardt | 2014-03-27 | 2 | -17/+4 |
| * | | | | | replace personalblock fieldset with section class in core user_ apps | Jan-Christoph Borchardt | 2014-03-27 | 2 | -9/+7 |
| * | | | | | replace personalblock fieldset with section class in files apps | Jan-Christoph Borchardt | 2014-03-27 | 4 | -271/+261 |
| * | | | | | replace personalblock fieldset with section div in admin and personal settings | Jan-Christoph Borchardt | 2014-03-27 | 2 | -124/+112 |
| * | | | | | general styles for the content area | Jan-Christoph Borchardt | 2014-03-27 | 1 | -3/+19 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #7966 from owncloud/url_generation_hack | Morris Jobke | 2014-04-01 | 1 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Check if web root has already been appended | Thomas Tanghus | 2014-03-31 | 1 | -1/+6 |
| | |/ / / | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-01 | 35 | -200/+242 |
* | | | | | Merge pull request #7967 from owncloud/sharing_fix_select_statement | Björn Schießle | 2014-03-31 | 1 | -2/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | select statement always need to contain file_source respectively item_source | Bjoern Schiessle | 2014-03-31 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge pull request #7916 from owncloud/fix-input-sizes | Morris Jobke | 2014-03-31 | 2 | -7/+11 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fix duplicate rules for button/input styles, em to px | Jan-Christoph Borchardt | 2014-03-31 | 1 | -3/+3 |
| * | | | convert input metrics to px | Jan-Christoph Borchardt | 2014-03-27 | 1 | -3/+8 |
| * | | | remove additional radio button width declaration | Jan-Christoph Borchardt | 2014-03-27 | 1 | -1/+0 |
| |/ / | |||||
* | | | Merge pull request #7939 from owncloud/wring_redirect_on_login | Vincent Petry | 2014-03-31 | 2 | -6/+6 |
|\ \ \ | |||||
| * | | | Sub-dir was prepended twice | Thomas Tanghus | 2014-03-29 | 1 | -1/+1 |
| * | | | Sub-dir was prepended twice | Thomas Tanghus | 2014-03-29 | 1 | -2/+1 |
| * | | | Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936 | Thomas Tanghus | 2014-03-28 | 1 | -4/+5 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-31 | 12 | -12/+12 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-30 | 18 | -53/+57 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-29 | 17 | -110/+113 |
* | | | | Merge pull request #7845 from duritong/fix_submodule_url | Thomas Müller | 2014-03-28 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | use https as submodule url | mh | 2014-03-21 | 1 | -1/+1 |
* | | | | | Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-master | Morris Jobke | 2014-03-28 | 1 | -3/+11 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | adding @method annotation to declare methods which can be called on the wrapp... | Thomas Müller | 2014-03-28 | 1 | -3/+11 |
* | | | | | Merge pull request #7934 from owncloud/addEventToExpirationDate | Vincent Petry | 2014-03-28 | 1 | -1/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Emit event after setting a new expiration for a share | Morris Jobke | 2014-03-28 | 1 | -1/+8 |
* | | | | | | Merge pull request #7770 from jamesryanbell/master | Morris Jobke | 2014-03-28 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SVG support detection | jamesryanbell | 2014-03-17 | 1 | -2/+2 |
* | | | | | | | Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_fails | Björn Schießle | 2014-03-28 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | don't write file if opening a stream to encrypt the data fails | Bjoern Schiessle | 2014-03-28 | 1 | -0/+2 |
* | | | | | | | Merge pull request #7824 from owncloud/hash-parameter-order | Thomas Müller | 2014-03-28 | 4 | -19/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix temporary file based common hash | Robin Appelman | 2014-03-21 | 1 | -2/+1 |
| * | | | | | | | Fix parameter order for Storage\Local::hash | Robin Appelman | 2014-03-20 | 3 | -17/+34 |
* | | | | | | | | Merge pull request #7879 from owncloud/sharing_cleanup_public_api | Vincent Petry | 2014-03-28 | 8 | -1706/+2026 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | finally fix the paths for the OCS Share API | Bjoern Schiessle | 2014-03-25 | 2 | -3/+88 |
| * | | | | | | | | fix path creation for re-shares, issue #7662 | Bjoern Schiessle | 2014-03-25 | 2 | -85/+7 |
| * | | | | | | | | don't assign variables in if condition | Bjoern Schiessle | 2014-03-25 | 1 | -18/+17 |
| * | | | | | | | | add todo | Bjoern Schiessle | 2014-03-25 | 1 | -1/+1 |