Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make class properties protected instead of private to allow subclassing | Tom Needham | 2013-04-23 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3077 from owncloud/rename-checksourcepath | Lukas Reschke | 2013-04-23 | 1 | -15/+23 |
|\ | | | | | Files: also check if the source path is valid when doing a rename or copy operation | ||||
| * | Files: also check if the source path is valid when doing a rename or copy ↵ | Robin Appelman | 2013-04-22 | 1 | -15/+23 |
| | | | | | | | | operation | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-23 | 24 | -195/+221 |
| | | |||||
* | | Merge pull request #3074 from owncloud/sqlite3-raiseerror | Bernhard Posselt | 2013-04-22 | 1 | -2/+2 |
|\ \ | | | | | | | Fix raiseError call in the MDB2 sqlite3 driver | ||||
| * | | Fix raiseError call in the MDB2 sqlite3 driver | Robin Appelman | 2013-04-22 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #3073 from owncloud/setup-error-message | Bernhard Posselt | 2013-04-22 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | Improve error message if user creation fails during setup | ||||
| * | | | Improve error message if user creation fails during setup | Robin Appelman | 2013-04-22 | 1 | -1/+2 |
| |/ / | |||||
* | | | Merge pull request #3078 from owncloud/files-dnd | Bernhard Posselt | 2013-04-22 | 1 | -3/+3 |
|\ \ \ | |_|/ |/| | | Files: Fix XSS when creating dropshadow | ||||
| * | | Files: Fix XSS when creating dropshadow | Robin Appelman | 2013-04-22 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #3019 from owncloud/fix-3004 | Bart Visscher | 2013-04-22 | 1 | -2/+4 |
|\ \ | |/ |/| | | | Test if we want a 3rdparty style/script before checking the 3rdparty root | ||||
| * | Test if we want a 3rdparty style/script before checking the 3rdparty root | Bart Visscher | 2013-04-19 | 1 | -2/+4 |
| | | |||||
* | | Merge pull request #2983 from owncloud/style-details | Jan-Christoph Borchardt | 2013-04-22 | 2 | -37/+43 |
|\ \ | | | | | | | Style details | ||||
| * | | remove unnecessary border from navigation, looked strange with scrollbar and ↵ | Jan-Christoph Borchardt | 2013-04-17 | 1 | -1/+1 |
| | | | | | | | | | | | | pushed the text over 1px | ||||
| * | | move password warning more relevant below password field, un-nest log in warning | Jan-Christoph Borchardt | 2013-04-17 | 1 | -17/+15 |
| | | | |||||
| * | | move warning and error states together in CSS, to be cleaned up | Jan-Christoph Borchardt | 2013-04-17 | 1 | -11/+18 |
| | | | |||||
| * | | make textarea inherit ownCloud font instead of using monospace | Jan-Christoph Borchardt | 2013-04-17 | 1 | -0/+1 |
| | | | |||||
| * | | correct primary color to #1d2d44 where slightly wrong | Jan-Christoph Borchardt | 2013-04-17 | 1 | -8/+8 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-22 | 27 | -176/+298 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-21 | 11 | -11/+11 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-20 | 25 | -147/+163 |
| | | | |||||
* | | | Merge pull request #3020 from owncloud/cleaner-webdav-reason | Bart Visscher | 2013-04-19 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Cleaner isWebDAVWorking reason, otherwise people overlook the reason | ||||
| * | | Cleaner isWebDAVWorking reason, otherwise people overlook the reason | Bart Visscher | 2013-04-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #3024 from owncloud/file-delete-action | Bart Visscher | 2013-04-19 | 2 | -4/+4 |
|\ \ \ | | | | | | | | | Fix #1164 and fix showing spinner on delete | ||||
| * | | | Fix displaying spinner on delete | Bart Visscher | 2013-04-19 | 1 | -3/+3 |
| | | | | |||||
| * | | | No need to strip slashes, json_decode handles that for us | Bart Visscher | 2013-04-19 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #3010 from owncloud/fix-cookie_path | Thomas Tanghus | 2013-04-19 | 1 | -2/+3 |
|\ \ \ | | | | | | | | | Don't use empty session.cookie_path, otherwise we get multiple cookies | ||||
| * | | | Don't use empty session.cookie_path, otherwise we get multiple cookies | Bart Visscher | 2013-04-18 | 1 | -2/+3 |
| |/ / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-19 | 11 | -11/+11 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-04-18 | 140 | -941/+643 |
| | | | |||||
* | | | Merge pull request #2986 from eMerzh/upgrade_warn | Bernhard Posselt | 2013-04-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Warn when we do an upgrade | ||||
| * | | | Warn when we do an upgrade | Brice Maron | 2013-04-17 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #2925 from owncloud/navigation-icon-fix | Raghu Nayyar | 2013-04-17 | 1 | -6/+29 |
|\ \ \ | |/ / |/| | | fix navigation hover effect, documentation | ||||
| * | | apply navigation hover effect directly to img and span, cleaner code | Jan-Christoph Borchardt | 2013-04-17 | 1 | -3/+23 |
| | | | |||||
| * | | additional comments | Jan-Christoph Borchardt | 2013-04-14 | 1 | -3/+3 |
| | | | |||||
| * | | fix navigation hover effect, documentation | Jan-Christoph Borchardt | 2013-04-14 | 1 | -5/+8 |
| | | | |||||
* | | | Merge pull request #2978 from owncloud/displayname_can_be_null | Bernhard Posselt | 2013-04-17 | 2 | -2/+1 |
|\ \ \ | | | | | | | | | Remove not null constraint. Fix #2976 | ||||
| * | | | Remove not null constraint. Fix #2976 | Thomas Tanghus | 2013-04-17 | 2 | -2/+1 |
| | | | | |||||
* | | | | Merge pull request #2975 from owncloud/log-date | Morris Jobke | 2013-04-17 | 3 | -3/+12 |
|\ \ \ \ | |/ / / |/| | | | use date and time instead of timestamp in log | ||||
| * | | | also adjust template properly for log date fix | Bernhard Posselt | 2013-04-17 | 1 | -1/+5 |
| | | | | |||||
| * | | | fix admin log display and use a more readable format | Bernhard Posselt | 2013-04-17 | 2 | -2/+6 |
| | | | | |||||
| * | | | use date and time instead of timestamp | Bernhard Posselt | 2013-04-17 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #2746 from owncloud/use-count-userexists | Thomas Tanghus | 2013-04-17 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Use count SQL to check for user existance | ||||
| * | | | | Use the MDB2 function to get the count result | Bart Visscher | 2013-04-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use count SQL to check for user existance | Bart Visscher | 2013-04-05 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | adapt free space calculation to the way it is done for the trash bin | Björn Schießle | 2013-04-17 | 1 | -7/+15 |
| | | | | | |||||
* | | | | | improved free space calculation if no quota is set, discussed in #2936 | Björn Schießle | 2013-04-17 | 1 | -23/+43 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better | Bart Visscher | 2013-04-17 | 2 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | Handle empty datafolder better. | ||||
| * | | | | Hint to default data directory | kondou | 2013-04-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not to before submitted data directory. Thanks to bartv2 for the heads up. | ||||
| * | | | | Handle empty datafolder better. | kondou | 2013-04-13 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If datafolder is erased, the default value will be shown as a placeholder. If installation is submitted without a datafolder the default value will be used. |