| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | Merge pull request #13636 from ↵ | Lukas Reschke | 2015-01-27 | 5 | -36/+235 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/add-warning-if-restore-of-data-is-not-possible Add value if restore of data is possible for a user | |||||
| | * | | | | | | | | Add value if restore of data is possible for a user | Morris Jobke | 2015-01-27 | 5 | -36/+235 | |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * reason: nice to know before password change in user management * restore is possible: * encryption is disabled * encryption is enabled, admin and user has checked the restore option * if not possible: * highlight users row in red once the admin wants to change the password * show also a little tipsy | |||||
| * | | | | | | | | Merge pull request #13701 from owncloud/disable-appcode-checker | Lukas Reschke | 2015-01-27 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | disable the app code checker - some previous shipped apps cannot be inst... | |||||
| | * | | | | | | | disable the app code checker - some previous shipped apps cannot be ↵ | Thomas Müller | 2015-01-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed from the appstore now :facepunch: | |||||
| * | | | | | | | | Merge pull request #13676 from owncloud/fix-node-iface | Thomas Müller | 2015-01-27 | 2 | -3/+2 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix node interface | |||||
| | * | | | | | | | | fix node interface | Bernhard Posselt | 2015-01-26 | 2 | -3/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #13679 from owncloud/public-disablesharejsplugin | Thomas Müller | 2015-01-27 | 3 | -3/+30 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Disable JS plugin for sharing in public mode | |||||
| | * | | | | | | | | | Do not disclose share owner in public file list | Vincent Petry | 2015-01-26 | 1 | -1/+4 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Disable JS plugin for sharing in public mode | Vincent Petry | 2015-01-26 | 2 | -2/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the logic that registers the share action and modifies the rows. Share actions aren't needed in the public file list. | |||||
| * | | | | | | | | | | Merge pull request #13691 from owncloud/s2s-acceptsinglefile | Thomas Müller | 2015-01-27 | 2 | -4/+124 | |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | Only reload file list after remote share accept request returns | |||||
| | * | | | | | | | | | Only reload file list after remote share accept request returns | Vincent Petry | 2015-01-26 | 2 | -4/+124 | |
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accepting a remote share, an ajax request is sent to the server. Only once this request returns should the file list be reloaded. | |||||
| * | | | | | | | | | Merge pull request #13694 from ↵ | Thomas Müller | 2015-01-27 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/little-bit-more-descriptive-htaccess-error Make error more descriptive | |||||
| | * | | | | | | | | | Make error more descriptive | Lukas Reschke | 2015-01-26 | 1 | -1/+1 | |
| | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Ref https://github.com/owncloud/core/issues/13693#issuecomment-71546767 | |||||
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-27 | 6 | -0/+12 | |
| | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | | Merge pull request #13490 from owncloud/fix_reshare_s2s_share | Vincent Petry | 2015-01-26 | 10 | -68/+98 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | use uid provided by setupfs hook to mount server2server shares | |||||
| | * | | | | | | | | certificate manager should always use a \OC\Files\View otherwise we will get ↵ | Bjoern Schiessle | 2015-01-26 | 4 | -19/+48 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | problems for different primary storages | |||||
| | * | | | | | | | | certificate manager only needs the user-id, no need to pass on the complete ↵ | Bjoern Schiessle | 2015-01-26 | 6 | -20/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user object | |||||
| | * | | | | | | | | use uid provided by setupfs hook to mount server2server shares, otherwise ↵ | Bjoern Schiessle | 2015-01-26 | 5 | -35/+34 | |
| | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | mount will fail for public link shares | |||||
| * | | | | | | | | Merge pull request #13677 from owncloud/s2s-doubleslashrequest | Vincent Petry | 2015-01-26 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Prevent double slash in shareinfo request URL | |||||
| | * | | | | | | | Prevent double slash in shareinfo request URL | Vincent Petry | 2015-01-26 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #13660 from owncloud/remove-duplicate-service-definition | Thomas Müller | 2015-01-26 | 1 | -12/+0 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Remove duplicated definition of APIController | |||||
| | * | | | | | | Remove duplicated definition of APIController | Joas Schilling | 2015-01-26 | 1 | -12/+0 | |
| | |/ / / / / | ||||||
| * | | | | | | Merge pull request #13621 from owncloud/system-config-multiset | Thomas Müller | 2015-01-26 | 15 | -137/+258 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Add a method to set/unset multiple config values with one write | |||||
| | * | | | | | naming fixes while reviewing | Thomas Müller | 2015-01-26 | 3 | -19/+21 | |
| | | | | | | | ||||||
| | * | | | | | Use setConfigs() instead of calling setConfig() multiple times | Joas Schilling | 2015-01-23 | 9 | -99/+105 | |
| | | | | | | | ||||||
| | * | | | | | Add a method to set/unset multiple config values in one call | Joas Schilling | 2015-01-23 | 6 | -22/+135 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces the number of file writes we do for config.php and therefor hopefully helps lowering the chances for empty config.php files | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-26 | 2 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | 8.0 beta 2v8.0.0beta2 | Frank Karlitschek | 2015-01-26 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-25 | 28 | -14/+80 | |
| | | | | | | | ||||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-24 | 80 | -6/+190 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #13637 from owncloud/s2s_notification_new_defaults | Björn Schießle | 2015-01-23 | 2 | -3/+75 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | by default send mail for new server-to-server share | |||||
| | * | | | | | | by default send mail for new server-to-server share | Bjoern Schiessle | 2015-01-23 | 2 | -3/+75 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #13626 from owncloud/check-for-hhvm | Clark Tomlinson | 2015-01-23 | 1 | -0/+14 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Don't check for `always_populate_raw_post_data` on HHVM | |||||
| | * | | | | | | Don't check for `always_populate_raw_post_data` on HHVM | Lukas Reschke | 2015-01-23 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HHVM seems to have problems with this at the moment (even setting those values in the php.ini of HHVM doesn't have helped much) and thus the unit test execution failed. So it's better if we disable this check for now for HHVM. | |||||
| * | | | | | | | Merge pull request #13463 from owncloud/share-getitemsharedwithuser-emptygroup | Lukas Reschke | 2015-01-23 | 2 | -21/+48 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Do not retrieve shares through group if user has no group | |||||
| | * | | | | | | Do not retrieve shares through group if user has no group | Vincent Petry | 2015-01-23 | 2 | -21/+48 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #13479 from ↵ | Lukas Reschke | 2015-01-23 | 2 | -3/+19 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue/13475-favorites-and-unavailable-external-storages Ignore favorites that are not available when creating the favorites list | |||||
| | * | | | | | | Ignore favorites that are not available when creating the favorites list | Joas Schilling | 2015-01-23 | 2 | -3/+19 | |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | Also correctly return the exception for all cases when adding/removing favos | |||||
| * | | | | | | Merge pull request #13590 from owncloud/sabredav-1.8.12 | Morris Jobke | 2015-01-23 | 1 | -0/+0 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Update SabreDAV to 1.8.12 | |||||
| | * | | | | | Update SabreDAV to 1.8.12 | Thomas Müller | 2015-01-23 | 1 | -0/+0 | |
| | | |_|_|/ | |/| | | | ||||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-23 | 22 | -6/+58 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #13593 from owncloud/add-check-for-raw-post-data | Morris Jobke | 2015-01-22 | 3 | -2/+19 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Add check for `HTTP_RAW_POST_DATA` setting for >= 5.6 | |||||
| | * | | | | | add always_populate_raw_post_data to .user.ini | Morris Jobke | 2015-01-22 | 1 | -0/+1 | |
| | | | | | | | ||||||
| | * | | | | | translate error messages | Morris Jobke | 2015-01-22 | 1 | -4/+4 | |
| | | | | | | | ||||||
| | * | | | | | Add check for `HTTP_RAW_POST_DATA` setting for >= 5.6 | Lukas Reschke | 2015-01-22 | 2 | -0/+16 | |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | PHP 5.6 otherwise throws notices for perfectly valid code which results in broken endpoints. Fixes https://github.com/owncloud/core/issues/13592 | |||||
| * | | | | | Merge pull request #13314 from owncloud/login-hook-logout | Morris Jobke | 2015-01-22 | 5 | -12/+41 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Return false if the login is canceled in a hook | |||||
| | * | | | | | Throw an exception when login is canceled by an app | Robin Appelman | 2015-01-22 | 3 | -11/+33 | |
| | | | | | | | ||||||
| | * | | | | | Allow custom error messages for the login page | Robin Appelman | 2015-01-22 | 2 | -1/+8 | |
| | | | | | | | ||||||
| | * | | | | | Return false if the login is canceled in a hook | Robin Appelman | 2015-01-13 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #13449 from owncloud/image_preview_limit | Thomas Müller | 2015-01-22 | 2 | -0/+19 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | add config-option for an image's maximum filesize when generating previews | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |