Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #3870 from owncloud/reset_migration_status | Björn Schießle | 2013-07-02 | 3 | -0/+25 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix function documentation | Björn Schießle | 2013-06-27 | 1 | -1/+1 | |
| * | | | | | introduce pre-disable-app hook and use it for the encryption app to reset mig... | Björn Schießle | 2013-06-27 | 3 | -0/+25 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-02 | 68 | -65/+67 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | improved error message | Björn Schießle | 2013-07-02 | 1 | -1/+1 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge pull request #3903 from owncloud/nonpublic-uploading | Thomas Müller | 2013-07-01 | 2 | -36/+36 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | fix detection of public upload in filelist.js | Robin Appelman | 2013-07-01 | 1 | -1/+1 | |
| * | | | fix uploading when ['dirtoken'] is not set | Robin Appelman | 2013-07-01 | 1 | -1/+1 | |
| * | | | code style | Robin Appelman | 2013-07-01 | 1 | -34/+34 | |
* | | | | add logo claim to defaults.php | Björn Schießle | 2013-07-01 | 1 | -3/+1 | |
* | | | | logo claim added | Björn Schießle | 2013-07-01 | 1 | -0/+3 | |
* | | | | construct the foother in defaults.php so that we use always the same footer | Björn Schießle | 2013-07-01 | 1 | -3/+2 | |
* | | | | Merge pull request #3223 from owncloud/fix-2820 | Morris Jobke | 2013-07-01 | 3 | -7/+38 | |
|\ \ \ \ | ||||||
| * | | | | if rename of file fails, the rename is undone in the view - #fix 2820 | Morris Jobke | 2013-06-15 | 3 | -7/+38 | |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-01 | 2 | -22/+26 | |
| |/ / / |/| | | | ||||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-30 | 62 | -9/+129 | |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-29 | 66 | -356/+403 | |
* | | | | Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-en... | Thomas Müller | 2013-06-28 | 1 | -1/+5 | |
|\ \ \ \ | ||||||
| * | | | | for now we disable public upload in case encryption is enabled | Thomas Mueller | 2013-06-28 | 1 | -1/+5 | |
* | | | | | Merge pull request #1044 from owncloud/fix_extra_slash | Bart Visscher | 2013-06-28 | 1 | -1/+5 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | update to !== | Bart Visscher | 2013-06-28 | 1 | -1/+1 | |
| * | | | | only encodeURIComponent once | Jörn Friedrich Dreyer | 2013-02-09 | 1 | -2/+2 | |
| * | | | | Check if extra / is necessary for the folder URL | Michael Gapczynski | 2013-02-09 | 1 | -1/+5 | |
* | | | | | Merge pull request #3838 from rgeber/master | Jörn Friedrich Dreyer | 2013-06-28 | 10 | -168/+543 | |
|\ \ \ \ \ | ||||||
| * | | | | | Added file-upload to GIT repo | Roman Geber | 2013-06-26 | 2 | -8/+351 | |
| * | | | | | Public upload feature | Roman Geber | 2013-06-25 | 9 | -167/+199 | |
* | | | | | | Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_m... | Bart Visscher | 2013-06-28 | 3 | -22/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix numRows usage in files_encryption | Jörn Friedrich Dreyer | 2013-06-24 | 1 | -15/+3 | |
| * | | | | | | fix numRows usage in user_ldap | Jörn Friedrich Dreyer | 2013-06-24 | 2 | -7/+5 | |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-28 | 1 | -1/+11 | |
| |_|_|_|/ / |/| | | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-27 | 4 | -6/+35 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-26 | 6 | -1/+58 | |
| |/ / / |/| | | | ||||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-25 | 8 | -2/+41 | |
|/ / / | ||||||
* | | | Add a CLI script for manually triggering checking a folder for updates | Robin Appelman | 2013-06-23 | 1 | -0/+22 | |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-23 | 3 | -2/+23 | |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-22 | 24 | -101/+1 | |
* | | | Merge pull request #3810 from owncloud/improve_webdavauth | Thomas Müller | 2013-06-21 | 1 | -4/+4 | |
|\ \ \ | ||||||
| * | | | improve error handling of webdavauth | Georg Ehrke | 2013-06-21 | 1 | -4/+4 | |
* | | | | fix some strings in the admin settings, it's not a 'recovery account' but a '... | Björn Schießle | 2013-06-21 | 1 | -5/+5 | |
* | | | | encryption is LDAP compatible | Björn Schießle | 2013-06-21 | 1 | -1/+1 | |
* | | | | Squashed commit of the following: | Björn Schießle | 2013-06-21 | 2 | -9/+18 | |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-21 | 6 | -0/+47 | |
* | | | | Merge pull request #3788 from owncloud/more_error_messages | Björn Schießle | 2013-06-20 | 2 | -26/+28 | |
|\ \ \ \ | ||||||
| * | | | | always have a defined return value | Björn Schießle | 2013-06-19 | 1 | -4/+4 | |
| * | | | | some more error messages | Björn Schießle | 2013-06-19 | 1 | -5/+3 | |
| * | | | | add some more error messages, in case something went wrong | Björn Schießle | 2013-06-19 | 2 | -24/+28 | |
* | | | | | Merge pull request #3784 from owncloud/rescan-all | Thomas Müller | 2013-06-20 | 2 | -15/+45 | |
|\ \ \ \ \ | ||||||
| * | | | | | use json to encode user list | Robin Appelman | 2013-06-19 | 2 | -2/+2 | |
| * | | | | | allow scanning files for multiple users | Robin Appelman | 2013-06-19 | 2 | -15/+45 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-20 | 8 | -17/+36 | |
| |_|/ / / |/| | | | |