| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #2096 from owncloud/cache-upgrade-id | Michael Gapczynski | 2013-03-04 | 1 | -4/+5 |
| |\ | | | | | Cache: also check if the file id is already in the cache during upgrade | ||||
| | * | Cache: more efficient detection for existing entries during upgrade | Robin Appelman | 2013-03-04 | 1 | -9/+3 |
| | | | |||||
| | * | Cache: also check if the file id is already in the cache during upgrade | Robin Appelman | 2013-03-04 | 1 | -3/+10 |
| | | | | | | | | | Should solve upgrade issues if only some of the configured storages were migrated previously | ||||
| * | | Merge pull request #2088 from owncloud/fixing-1844-again-master | Bernhard Posselt | 2013-03-04 | 2 | -2/+10 |
| |\ \ | | | | | | | adding test case for getDefaultEmailAddress() + fixing #1844 again | ||||
| | * | | adding test case for getDefaultEmailAddress() + fixing #1844 again | Thomas Mueller | 2013-03-04 | 2 | -2/+10 |
| | | | | |||||
| * | | | Merge pull request #2078 from owncloud/save_category_relations | Thomas Müller | 2013-03-04 | 1 | -5/+4 |
| |\ \ \ | | | | | | | | | VCategories: Don't forget to save category relations if category exists. | ||||
| | * | | | VCategories: Don't forget to save category relations if category exists. | Thomas Tanghus | 2013-03-04 | 1 | -5/+4 |
| | | | | | |||||
| * | | | | Only send the standard headers | Lukas Reschke | 2013-03-04 | 1 | -1/+0 |
| | |/ / |/| | | | | | Fixes https://github.com/owncloud/apps/issues/675 | ||||
| * | | | Fix #2074 by initializing as an array | Michael Gapczynski | 2013-03-04 | 2 | -7/+7 |
| |/ / | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-04 | 1 | -0/+12 |
| | | | |||||
| * | | Disable loading of backgroundjobs js when upgrade is needed | Bart Visscher | 2013-03-03 | 1 | -1/+1 |
| | | | |||||
| * | | Check maintenance mode before loading apps in route matcher | Bart Visscher | 2013-03-03 | 1 | -1/+3 |
| | | | |||||
| * | | Chunk size comment should say kB, not MB | Michael Gapczynski | 2013-03-03 | 1 | -1/+1 |
| | | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-03 | 3 | -0/+3 |
| | | | |||||
| * | | Merge pull request #2036 from owncloud/escape-only-in-template | Frank Karlitschek | 2013-03-02 | 1 | -2/+2 |
| |\ \ | | | | | | | Escape the data only in the template | ||||
| | * | | Escape the data only in the template | Lukas Reschke | 2013-03-02 | 1 | -2/+2 |
| | | | | |||||
| * | | | Avoid to display empty DisplayNames for menu and title | Brice Maron | 2013-03-02 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #2026 from j-ed/master | Lukas Reschke | 2013-03-02 | 1 | -2/+9 |
| |\ \ \ | | | | | | | | | do not try to extract image infos from 0- or better less than 12-byte length files. | ||||
| | * | | | Update image.php | j-ed | 2013-03-02 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | don't try to extract image infos from 0- or better less than 12 byte length files. See description of `exif_imagetype` function at `http://php.net/manual/de/function.exif-imagetype.php`. | ||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-02 | 3 | -0/+6 |
| | |/ / |/| | | |||||
| * | | | Merge master | Lukas Reschke | 2013-03-01 | 12 | -14/+55 |
| |\ \ \ | |||||
| | * | | | validate the generated email address and fall back to localhost.localdomain ↵ | Thomas Mueller | 2013-03-01 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | in case it is not valid fixes #1844 | ||||
| | * | | | for this self test we don't care if the ssl certificate is self signed and ↵ | Thomas Mueller | 2013-03-01 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | the peer cannot be verified. | ||||
| | * | | | Merge pull request #2008 from owncloud/1999-requesttoken | Frank Karlitschek | 2013-03-01 | 1 | -3/+7 |
| | |\ \ \ | | | | | | | | | | | Check if requesttoken exists in session | ||||
| | | * | | | Check if requesttoken exists in session | Lukas Reschke | 2013-03-01 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | Ref #1999 | ||||
| | | * | | | Style fixes | Lukas Reschke | 2013-03-01 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | 5.0 RC 1v5.0.0RC1 | Frank Karlitschek | 2013-03-01 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-03-01 | 9 | -3/+12 |
| | | |_|/ | |/| | | |||||
| | * | | | Merge pull request #1937 from owncloud/check-resharing | Bart Visscher | 2013-02-28 | 1 | -2/+24 |
| | |\ \ \ | | |/ / | |/| | | Check resharing setting | ||||
| | | * | | Check resharing setting | Michael Gapczynski | 2013-02-26 | 1 | -2/+24 |
| | | | | | |||||
| * | | | | Merge master | Lukas Reschke | 2013-02-28 | 7 | -12/+32 |
| |\| | | | |||||
| | * | | | Merge pull request #1988 from owncloud/permissionscache_clean | icewind1991 | 2013-02-28 | 2 | -10/+18 |
| | |\ \ \ | | | | | | | | | | | Clean permissions cache when deleting file | ||||
| | | * | | | Cache: cleanup permissions cache when removing a file from the cache | Robin Appelman | 2013-02-28 | 1 | -0/+3 |
| | | | | | | |||||
| | | * | | | Cache: add option to delete file from permissions cache for all users | Robin Appelman | 2013-02-28 | 1 | -10/+15 |
| | | | | | | |||||
| | * | | | | Merge pull request #1989 from owncloud/selectSanitize | Björn Schießle | 2013-02-28 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |/| | | | Sanitize HTML in html_select_options | ||||
| | | * | | | Sanitize HTML in html_select_options | Lukas Reschke | 2013-02-28 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | add checks for xml and dom when installing | Bernhard Posselt | 2013-02-28 | 1 | -1/+10 |
| | | | | | | |||||
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-28 | 3 | -0/+3 |
| | |/ / / | |||||
| * | | | | Merge master | Lukas Reschke | 2013-02-27 | 3 | -5/+32 |
| |\| | | | |||||
| | * | | | Merge pull request #1972 from owncloud/raw-pathinfo | Bernhard Posselt | 2013-02-27 | 2 | -2/+15 |
| | |\ \ \ | | | | | | | | | | | Use the plain urlencoded path info for the routing matching | ||||
| | | * | | | Use the plain urlencoded path info for the routing matching | Bart Visscher | 2013-02-27 | 2 | -2/+15 |
| | | |/ / | |||||
| | * | | | Disable query cache for Sqlite | Bart Visscher | 2013-02-27 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | Merge pull request #1944 from owncloud/query-caching-upgrade | Bernhard Posselt | 2013-02-27 | 1 | -2/+13 |
| | |\ \ \ | | |_|/ | |/| | | Disable prepared query caching while doing an upgrade | ||||
| | | * | | Disable prepared query caching while doing an upgrade | Robin Appelman | 2013-02-26 | 1 | -2/+13 |
| | | | | | |||||
| * | | | | [core] From echo to p | Lukas Reschke | 2013-02-27 | 3 | -9/+9 |
| | | | | | |||||
| * | | | | Remove the template autoescaping | Lukas Reschke | 2013-02-27 | 1 | -3/+1 |
| |/ / / | | | | | | | | | | Ref #1963 | ||||
| * | | | Merge pull request #1031 from owncloud/external_storage_ui_feedback | Michael Gapczynski | 2013-02-27 | 1 | -0/+7 |
| |\ \ \ | | | | | | | | | External Storage UI Improvements | ||||
| | * \ \ | Merge branch 'master' into external_storage_ui_feedback | Michael Gapczynski | 2013-02-25 | 32 | -219/+706 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into external_storage_ui_feedback | Michael Gapczynski | 2013-02-19 | 80 | -485/+1406 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/js/settings.js apps/files_external/lib/smb.php apps/files_external/templates/settings.php lib/files/storage/common.php | ||||
| | * \ \ \ \ | Merge branch 'master' into external_storage_ui_feedback | Thomas Mueller | 2013-02-12 | 8 | -13/+113 |
| | |\ \ \ \ \ | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |