Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-16 | 45 | -142/+167 |
| | |||||
* | Merge pull request #3371 from owncloud/fix-3353 | Thomas Müller | 2013-05-15 | 1 | -2/+2 |
|\ | | | | | Fix finding mount in background watcher, fixes #3353 | ||||
| * | Merge branch 'master' into fix-3353 | Thomas Mueller | 2013-05-15 | 4 | -2/+99 |
| |\ | |/ |/| | |||||
* | | Merge pull request #3374 from owncloud/vobject_compound_property | Thomas Müller | 2013-05-15 | 3 | -1/+95 |
|\ \ | | | | | | | Add Compound property to avoid double escaping values. | ||||
| * | | No unit test coverage reports for pgsql - this causes issues on Jenkins. | Thomas Mueller | 2013-05-15 | 1 | -1/+6 |
| | | | |||||
| * | | Add Compound property to avoid double escaping values. | Thomas Tanghus | 2013-05-15 | 2 | -0/+89 |
| | | | |||||
* | | | Merge pull request #3376 from owncloud/fix_for_disappearing_root_mount_point | Thomas Müller | 2013-05-15 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | fix for disappearing root mount point on lib/files/filesystem.php | ||||
| * | | | fix for losing mount point "/" | Florin Peter | 2013-05-15 | 1 | -1/+4 |
|/ / / | |||||
| | * | Fix finding mount in background watcher, fixes #3353 | Michael Gapczynski | 2013-05-15 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge pull request #3366 from owncloud/contributing_add_contacts | Michael Gapczynski | 2013-05-15 | 1 | -1/+2 |
|\ \ | | | | | | | Add Contacts repo to CONTRIBUTING.md | ||||
| * | | Add Contacts repo to CONTRIBUTING.md | Thomas Tanghus | 2013-05-15 | 1 | -1/+2 |
|/ / | |||||
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-15 | 133 | -2828/+3136 |
|/ | |||||
* | Merge pull request #2821 from owncloud/fix-2159-rename-to-shared | Thomas Müller | 2013-05-14 | 3 | -19/+230 |
|\ | | | | | fix allowed rename of folder in root directory to reserved name "Shared" | ||||
| * | [files] add private declaration of $view | Morris Jobke | 2013-05-14 | 1 | -0/+1 |
| | | |||||
| * | [files] fix mock creation and remove hardcoded 'require' statement | Morris Jobke | 2013-05-12 | 2 | -7/+2 |
| | | |||||
| * | [files] rename lib to "App" | Morris Jobke | 2013-05-12 | 3 | -7/+7 |
| | | |||||
| * | [files] ownCloud typo | Morris Jobke | 2013-05-12 | 1 | -1/+1 |
| | | |||||
| * | [files] rename test class and add rename test | Morris Jobke | 2013-05-12 | 1 | -1/+22 |
| | | |||||
| * | [files] remove realpath in test | Morris Jobke | 2013-05-12 | 1 | -1/+1 |
| | | |||||
| * | [files] rename tests | Morris Jobke | 2013-05-12 | 1 | -0/+99 |
| | | |||||
| * | [files] remove normalizePath on rename and dependency injection | Morris Jobke | 2013-05-12 | 2 | -7/+8 |
| | | |||||
| * | [files] kill stripslashes | Morris Jobke | 2013-05-12 | 1 | -3/+3 |
| | | |||||
| * | [files] fix typos | Morris Jobke | 2013-05-12 | 1 | -5/+5 |
| | | |||||
| * | [files] refactoring | Morris Jobke | 2013-05-12 | 2 | -19/+111 |
| | | |||||
| * | string comparision | Morris Jobke | 2013-05-12 | 1 | -1/+1 |
| | | |||||
| * | wrong root dir name | Morris Jobke | 2013-05-12 | 1 | -2/+2 |
| | | |||||
| * | fix allowed rename of folder in root directory to reserved name "Shared" | Morris Jobke | 2013-05-12 | 1 | -2/+4 |
| | | | | | | | | refs #2159 | ||||
* | | fix history template, print_unescaped() needs to include closing tags | Björn Schießle | 2013-05-14 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #3338 from owncloud/button_color_fix | Raghu Nayyar | 2013-05-14 | 1 | -2/+4 |
|\ \ | | | | | | | Keeping Font Colors Consistant on the headers. | ||||
| * | | color change to crumb elements as well. | raghunayyar | 2013-05-14 | 1 | -1/+1 |
| | | | |||||
| * | | Keeping Font Colors Consistant on the headers. | raghunayyar | 2013-05-13 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #3330 from owncloud/preselect_filename_on_rename | Morris Jobke | 2013-05-14 | 2 | -0/+27 |
|\ \ \ | | | | | | | | | peselect filename without extension on rename | ||||
| * | | | peselect filename without extension on rename | Jörn Friedrich Dreyer | 2013-05-13 | 2 | -0/+27 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-14 | 11 | -11/+11 |
| |/ / |/| | | |||||
* | | | Merge pull request #3303 from owncloud/update_etags_on_restore | Morris Jobke | 2013-05-13 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | Make sure that etags get updated once a file gets retored from the trash bin | ||||
| * \ \ | Merge branch 'master' into update_etags_on_restore | Björn Schießle | 2013-05-13 | 136 | -990/+1336 |
| |\ \ \ | |||||
| * | | | | touch() needs to be performed relative to user/files otherwise ownCloud ↵ | Björn Schießle | 2013-05-10 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | doesn't execute the hooks which means that etags aren't updated properly | ||||
* | | | | | Merge pull request #3329 from owncloud/increase_lock_timeout | Bernhard Posselt | 2013-05-13 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Set the SQLite database lock timeout to 60 seconds which is the default ... | ||||
| * | | | | Set the SQLite database lock timeout to 60 seconds which is the default in ↵ | Frank Karlitschek | 2013-05-13 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | PHP anyways. I don't know why the MDB2 driver has this hardcoded to 0.1 seconds. This potentially fixes a lot of SQLite database lock problems and stuck in maintainance mode during upgrade issues. | ||||
* | | | | Merge pull request #3326 from owncloud/fix-3321 | Lukas Reschke | 2013-05-13 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Add requesttoken to guest view | ||||
| * | | | Add requesttoken to guest view | Lukas Reschke | 2013-05-13 | 1 | -1/+1 |
|/ / / | | | | | | | Should fix #3321 | ||||
* | | | Merge pull request #3235 from NCTU-NBA/pr-langcode | Morris Jobke | 2013-05-13 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Modify zh_* language codes | ||||
| * \ \ | Merge remote-tracking branch 'upstream/master' into pr-langcode | Pellaeon Lin | 2013-05-12 | 162 | -1108/+1720 |
| |\ \ \ | |||||
| * | | | | Modify zh_* language codes | Pellaeon Lin | 2013-05-04 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-13 | 13 | -32/+49 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #3311 from owncloud/disable_mbstring.func_overload | Morris Jobke | 2013-05-12 | 1 | -0/+1 |
|\ \ \ \ | |_|_|/ |/| | | | disable mbstring.func_overload in setup v.3 | ||||
| * | | | disable mbstring.func_overload in setup | Thomas Tanghus | 2013-05-12 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #3290 from owncloud/config-data | Lukas Reschke | 2013-05-12 | 3 | -5/+5 |
|\ \ \ \ | |/ / / |/| | | | Move config data to template | ||||
| * | | | Typo | Lukas Reschke | 2013-05-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | Get config from template | Lukas Reschke | 2013-05-12 | 3 | -5/+5 |
|/ / / |