Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rebuild app navigation in JS | Robin McCorkell | 2015-09-05 | 1 | -23/+0 |
| | | | | | | Retrieve all app navigations to prevent reloading appinfo/app.php and causing an error when the app isn't fully loaded. The addition/deletion logic has been moved to JS, simplifying a lot of code. | ||||
* | Merge pull request #18833 from owncloud/share-prevent-twice | Morris Jobke | 2015-09-04 | 1 | -0/+12 |
|\ | | | | | Prevent sharing twice with user when already a group | ||||
| * | Prevent sharing twice with user when already a group | Vincent Petry | 2015-09-04 | 1 | -0/+12 |
| | | |||||
* | | Merge pull request #18794 from individual-it/reuse_systemConfig | Individual IT Services | 2015-09-04 | 1 | -1/+1 |
|\ \ | | | | | | | reuse existing $systemConfig variable | ||||
| * | | reuse existing $systemConfig variable | Individual IT Services | 2015-09-03 | 1 | -1/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-04 | 2 | -0/+2 |
| | | | |||||
* | | | Merge pull request #18799 from owncloud/appconfig-with-one-request | Morris Jobke | 2015-09-03 | 1 | -110/+109 |
|\ \ \ | | | | | | | | | Only query the appconfig once per request | ||||
| * | | | Make sure the array exists | Joas Schilling | 2015-09-03 | 1 | -0/+8 |
| | | | | |||||
| * | | | Only query the appconfig once | Joas Schilling | 2015-09-03 | 1 | -111/+102 |
| | | | | |||||
* | | | | Merge pull request #18810 from owncloud/shared-mount-delay-setup | Vincent Petry | 2015-09-03 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | Delay setting up the filesystem for a share owner untill the share is used | ||||
| * | | | | setup owner when getting users for share | Robin Appelman | 2015-09-03 | 1 | -0/+2 |
| | |_|/ | |/| | | |||||
* / | | | Proper details about git submodule update | Morris Jobke | 2015-09-03 | 1 | -1/+1 |
|/ / / | | | | | | | | | | * fixes #18801 | ||||
* | | | Merge pull request #18777 from owncloud/locking-default | Morris Jobke | 2015-09-03 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | enable transational locking by default | ||||
| * | | | enable transational locking by default | Robin Appelman | 2015-09-02 | 1 | -4/+4 |
| | | | | |||||
* | | | | Encode HTML tags in JSON | Lukas Reschke | 2015-09-03 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | While not encoding the HTML tags in the JSON response is perfectly fine since we set the proper mimetype as well as disable content sniffing a lot of automated code scanner do report this as security bug. Encoding them leads to less discussions and a lot of saved time. | ||||
* | | | | Revert "Soft fail when deleting and no entry found" | Joas Schilling | 2015-09-02 | 1 | -4/+0 |
|/ / / | |||||
* / / | Soft fail when deleting and no entry found | Robin McCorkell | 2015-09-02 | 1 | -0/+4 |
|/ / | |||||
* | | Allow creating previewss that cover the specified dimensions | Robin Appelman | 2015-09-02 | 1 | -6/+68 |
| | | |||||
* | | Merge pull request #18744 from owncloud/fix-ocs-router | Morris Jobke | 2015-09-02 | 1 | -2/+3 |
|\ \ | |/ |/| | Delay adding OCS prefix to route collection until all is loaded | ||||
| * | Delay adding OCS prefix to route collection until all is loaded | Robin McCorkell | 2015-09-01 | 1 | -2/+3 |
| | | | | | | | | | | ->addPrefix() iterates over all registered routes, so must be run after all apps have had a chance to load their OCS routes. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-01 | 2 | -0/+2 |
| | | |||||
* | | Merge pull request #18743 from owncloud/autoloader-check-log-path | Robin Appelman | 2015-09-01 | 1 | -1/+1 |
|\ \ | |/ |/| | Show the path as part of the exception for not allowed autoloading paths | ||||
| * | Show the path as part of the exception for not allowed autoloading paths | Robin Appelman | 2015-09-01 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #18730 from owncloud/appframework_proper_304 | Vincent Petry | 2015-09-01 | 1 | -1/+1 |
|\ \ | |/ |/| | Properly return 304 in AppFramework | ||||
| * | Properly return 304 | Roeland Jago Douma | 2015-09-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | The ETag set in the IF_NONE_MODIFIED header is wraped in quotes ("). However the ETag that is set in response is not (yet). Also we need to cast the ETag to a string. * Added unit test | ||||
* | | verify the path in the autoloader | Robin Appelman | 2015-09-01 | 2 | -5/+47 |
| | | |||||
* | | Merge pull request #18635 from ↵ | Vincent Petry | 2015-08-31 | 1 | -1/+13 |
|\ \ | |/ |/| | | | | | owncloud/stickify-files-and-sharing-notification-types Sticky the notification types of files and sharing | ||||
| * | Sticky the notification types of files and sharing | Joas Schilling | 2015-08-28 | 1 | -1/+13 |
| | | |||||
* | | Merge pull request #17899 from owncloud/enc_make_key_storage_root_configurable | Vincent Petry | 2015-08-31 | 6 | -30/+133 |
|\ \ | | | | | | | Make root of key storage configurable | ||||
| * | | don't read certificates if ownCloud is not installed | Bjoern Schiessle | 2015-08-30 | 3 | -3/+17 |
| | | | |||||
| * | | make system root of key storage configurable | Bjoern Schiessle | 2015-08-30 | 4 | -29/+118 |
| | | | |||||
* | | | Merge pull request #18691 from owncloud/request-no-read | Morris Jobke | 2015-08-31 | 1 | -34/+49 |
|\ \ \ | | | | | | | | | Decode request content only on getContent | ||||
| * | | | Decode request content only on getContent | Robin McCorkell | 2015-08-31 | 1 | -34/+49 |
| | |/ | |/| | |||||
* | | | Merge pull request #10149 from owncloud/storage-wrapper-check | Morris Jobke | 2015-08-30 | 1 | -0/+3 |
|\ \ \ | |_|/ |/| | | Check result of storage wrappers | ||||
| * | | Check result of storage wrappers | Robin Appelman | 2015-08-30 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #18651 from owncloud/ocs_share_create_with_expire | Vincent Petry | 2015-08-30 | 1 | -0/+15 |
|\ \ \ | |/ / |/| | | Allow to directly set the expireDate on a new (link)share | ||||
| * | | Actually validate the expire date on share | Roeland Jago Douma | 2015-08-30 | 1 | -0/+15 |
| |/ | | | | | | | * Added more intergration tests | ||||
* | | Merge pull request #18620 from owncloud/add-public-interface-for-factory | Vincent Petry | 2015-08-29 | 5 | -17/+63 |
|\ \ | | | | | | | Add a public interface for the language factory so apps can use it | ||||
| * | | Add since tag | Joas Schilling | 2015-08-28 | 1 | -0/+4 |
| | | | |||||
| * | | Deprecate OC_L10N::get() | Joas Schilling | 2015-08-28 | 2 | -7/+4 |
| | | | |||||
| * | | Add a public interface for the language factory so apps can use it | Joas Schilling | 2015-08-27 | 3 | -10/+55 |
| | | | |||||
* | | | Merge pull request #18511 from owncloud/downgrad-sharing-error-logs-to-debug | Joas Schilling | 2015-08-28 | 1 | -22/+22 |
|\ \ \ | | | | | | | | | Change log level of debugging logs to debug | ||||
| * | | | Change log level of debugging logs to debug | Joas Schilling | 2015-08-24 | 1 | -22/+22 |
| | | | | |||||
* | | | | Merge pull request #18423 from owncloud/occ_encrypt_all | Björn Schießle | 2015-08-28 | 2 | -29/+27 |
|\ \ \ \ | |_|_|/ |/| | | | occ command line tool to encrypt all files | ||||
| * | | | copy always file by file to encrypt/decrypt it if needed | Bjoern Schiessle | 2015-08-26 | 1 | -29/+15 |
| | | | | |||||
| * | | | occ tool to encrypt all files | Bjoern Schiessle | 2015-08-26 | 1 | -0/+12 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-28 | 6 | -2/+6 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-27 | 6 | -0/+6 |
| | | | | |||||
* | | | | Remove last occurence of `forcessl` | Lukas Reschke | 2015-08-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | This shoudl have been adjusted as well, now it's consistent with `setMagicInCookie`. While it does not have a security impact directly some automated scanners reported this all the time. | ||||
* | | | | Remove languages which are no longer maintained on transifex | Thomas Müller | 2015-08-26 | 34 | -342/+0 |
| |_|/ |/| | |