| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Remove disabled autocorrect for new file names | Morris Jobke | 2016-03-09 | 1 | -1/+1 |
| | | | | | * ref #22784 | ||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-09 | 28 | -8/+124 |
| | | |||||
| * | Merge pull request #22950 from owncloud/fixsharemountrecursion | Roeland Douma | 2016-03-08 | 3 | -3/+10 |
| |\ | | | | | Fix share mounting recursion | ||||
| | * | Fix share mounting recursion | Vincent Petry | 2016-03-08 | 3 | -3/+10 |
| |/ | |||||
| * | Merge pull request #22936 from ↵ | Thomas Müller | 2016-03-08 | 5 | -18/+31 |
| |\ | | | | | | | | | owncloud/fix-group-share-migration-for-calendars-and-contacts Fix migration of group shared calendars and addressbooks | ||||
| | * | Fix group sharing and sharing permissions - fixes #22932 | Thomas Müller | 2016-03-08 | 5 | -18/+31 |
| | | | |||||
| * | | Merge pull request #22814 from owncloud/delete-empty-file | Thomas Müller | 2016-03-08 | 1 | -0/+0 |
| |\ \ | |/ |/| | Delete empty file | ||||
| | * | Delete empty file | Lukas Reschke | 2016-03-03 | 1 | -0/+0 |
| | | | | | | | Ref https://github.com/owncloud/core/issues/22803#issuecomment-191749499 | ||||
| * | | Merge pull request #22800 from owncloud/fix-20536 | Thomas Müller | 2016-03-08 | 1 | -0/+3 |
| |\ \ | | | | | | | don't hide server not available exception, fixes #20536 | ||||
| | * | | don't hide server not available exception, fixes #20536 | Arthur Schiwon | 2016-03-03 | 1 | -0/+3 |
| | | | | |||||
| * | | | Merge pull request #22885 from owncloud/master-show-version-to-update-to | Thomas Müller | 2016-03-08 | 2 | -3/+6 |
| |\ \ \ | | | | | | | | | Show version to update to properly | ||||
| | * | | | Show version to update to properly | Lukas Reschke | 2016-03-05 | 2 | -3/+6 |
| | | | | | | | | | | | | | | | | | Properly shows the version that will be updated to. | ||||
| * | | | | Merge pull request #22915 from owncloud/cleanup_ocs_share_api | Thomas Müller | 2016-03-08 | 1 | -57/+37 |
| |\ \ \ \ | | | | | | | | | | | Cleanup OCS Share Api | ||||
| | * | | | | Can't convert node to string | Roeland Jago Douma | 2016-03-07 | 1 | -1/+6 |
| | | | | | | |||||
| | * | | | | Move common code to function | Roeland Jago Douma | 2016-03-07 | 1 | -56/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | The code to get a share by id is somewhat messy. And was duplicated. Now this is done is a separate function | ||||
| * | | | | | Merge pull request #22918 from owncloud/remove-double-encoding-in-name | Thomas Müller | 2016-03-08 | 1 | -4/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | Remove double URL encoding | ||||
| | * | | | | | Remove double URL encoding | Lukas Reschke | 2016-03-07 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ZipStreamer as bundled with 9.0 will properly encode the filename already. Fixes https://github.com/owncloud/core/issues/22836#issuecomment-193336245 | ||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-08 | 36 | -24/+130 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #22921 from owncloud/add-before-command | Thomas Müller | 2016-03-07 | 1 | -0/+3 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Initialize submodules for Scrutinizer as well | ||||
| | * | | | | | Initialize submodules for Scrutinizer as well | Lukas Reschke | 2016-03-07 | 1 | -0/+3 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | Scrutinizer otherwise complains about the fact that some classes are undefined etc. Let's see whether that works :smile: | ||||
| * | | | | | Merge pull request #22880 from owncloud/fix-21656 | Thomas Müller | 2016-03-07 | 2 | -1/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | improve log output when no LDAP user was found on login attempt | ||||
| | * | | | | | improve log output when no LDAP user was found on login attempt | Arthur Schiwon | 2016-03-05 | 2 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #22911 from owncloud/fix-failing-migration | Thomas Müller | 2016-03-07 | 6 | -28/+68 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Handle calendar migration issue by writing the faulty event to the lo… | ||||
| | * | | | | | Calendar and addressbook migration commands are always available | Thomas Müller | 2016-03-07 | 1 | -10/+2 |
| | | | | | | | |||||
| | * | | | | | Handle addressbook migration issue by writing the faulty event to the log ↵ | Thomas Müller | 2016-03-07 | 3 | -7/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | and continue | ||||
| | * | | | | | Handle calendar migration issue by writing the faulty event to the log and ↵ | Thomas Müller | 2016-03-07 | 3 | -11/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | continue | ||||
| * | | | | | | Merge pull request #22900 from owncloud/diskfreespace-filesworkaround | Thomas Müller | 2016-03-07 | 1 | -1/+9 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix call to disk_free_space when a file is provided | ||||
| | * | | | | | Fix call to disk_free_space when a file is provided | Vincent Petry | 2016-03-07 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of shared files, we have to call free_space() on the file name. This has the side-effect that when uploading to a local storage without quota set, it will call disk_free_space with the file name, which fails. This fix uses the parent folder in case the given path is a file. | ||||
| * | | | | | | Merge pull request #22902 from owncloud/share-archivenamedownloadall | Thomas Müller | 2016-03-07 | 2 | -3/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix archive file name when downloading public share | ||||
| | * | | | | | | Remove "files" arg from download URL in public link page | Vincent Petry | 2016-03-07 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no files were specified for download, it means folder download. In this case, no need to pass an empty "files" argument. | ||||
| | * | | | | | | Fix archive file name when downloading public share | Vincent Petry | 2016-03-07 | 1 | -1/+1 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When download a public link share folder using the button on the top right, it doesn't provide a list of files. This fix makes sure to trigger the correct logic when no file list was given. | ||||
| * | | | | | | Merge pull request #22898 from ↵ | Thomas Müller | 2016-03-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/quota-allowuploadwhenfreespaceisunlimited Fix uploading to fed share when free space is unlimited | ||||
| | * | | | | | | Fix uploading when free space is unlimited | Vincent Petry | 2016-03-07 | 1 | -1/+1 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A federated share can report unlimited quota as -3, so the ajax/upload.php code needs to be adjusted to block uploads when the free space is unlimited. | ||||
| * | | | | | | Merge pull request #22872 from owncloud/password-change-tooltip-text | Thomas Müller | 2016-03-07 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Update error text for link passwords | ||||
| | * | | | | | | Update error text for link passwords | Morris Jobke | 2016-03-04 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * this removes the old tooltip first before showing the new one to update the text - otherwise the old text will be shown | ||||
| * | | | | | | | Merge pull request #22815 from prastut/feature-enhance-loginflow | Thomas Müller | 2016-03-07 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Trigger login if remember_login checked | ||||
| | * | | | | | | | trigger login if remember_login checked | prastut | 2016-03-04 | 1 | -0/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #22812 from owncloud/node-lock | Thomas Müller | 2016-03-07 | 2 | -0/+75 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add locking to the node api | ||||
| | * | | | | | | | | Add locking to the node api | Robin Appelman | 2016-03-03 | 2 | -0/+75 |
| | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #22787 from owncloud/versions-fixmtimetooltip | Thomas Müller | 2016-03-07 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix tooltip for versions mtime | ||||
| | * | | | | | | | | Fix tooltip for versions mtime | Vincent Petry | 2016-03-02 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was missing a call to jquery.tooltip | ||||
| * | | | | | | | | | Merge pull request #22785 from owncloud/trash-returnfalseon401 | Thomas Müller | 2016-03-07 | 2 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Return false on 401 in file list + trash file list | ||||
| | * | | | | | | | | | Return false on 401 in file list + trash file list | Vincent Petry | 2016-03-03 | 2 | -0/+8 |
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives a chance to the global ajax error handler to do its work if the session expired. | ||||
| * | | | | | | | | | Merge pull request #22896 from owncloud/fix-v1-carddav-endpoint | Thomas Müller | 2016-03-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Correctly default to null and add type hint | ||||
| | * | | | | | | | | | Correctly default to null and add type hint | Joas Schilling | 2016-03-07 | 1 | -1/+1 |
| | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #22904 from owncloud/get-user-groups-should-return-an-array | Thomas Müller | 2016-03-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Make sure that the return value is an array | ||||
| | * | | | | | | | | | Make sure that the return value is an array | Joas Schilling | 2016-03-07 | 1 | -1/+1 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #22244 from owncloud/dont-update-shared-resource-properties | Thomas Müller | 2016-03-07 | 5 | -3/+84 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | For 9.0 we don't have the possibility to store calendar and addressbo… | ||||
| | * | | | | | | | | Allow to change properties of readonly calendars | Joas Schilling | 2016-02-29 | 1 | -0/+8 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Allow to hide a shared calendar | Joas Schilling | 2016-02-29 | 2 | -4/+29 |
| | | | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |