Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3690 from owncloud/use_execute_audited_in_filecache | Thomas Müller | 2013-06-13 | 7 | -122/+99 |
|\ | |||||
| * | fix another double wrapped array | Jörn Friedrich Dreyer | 2013-06-12 | 1 | -1/+1 |
| * | remove additional array wrapping | Jörn Friedrich Dreyer | 2013-06-12 | 1 | -3/+3 |
| * | use executeAudited in files cache | Jörn Friedrich Dreyer | 2013-06-12 | 7 | -122/+99 |
* | | Merge pull request #3686 from owncloud/minor_exception_cleanup | Thomas Müller | 2013-06-13 | 2 | -7/+3 |
|\ \ | |||||
| * | | PDOException has no previous(), oh the consistency ... | Jörn Friedrich Dreyer | 2013-06-13 | 1 | -1/+1 |
| * | | minor cleanup for exception handling | Jörn Friedrich Dreyer | 2013-06-12 | 1 | -6/+2 |
| |/ | |||||
* | | Merge pull request #3586 from owncloud/contributing | Morris Jobke | 2013-06-13 | 1 | -8/+12 |
|\ \ | |||||
| * | | Fix typo | Morris Jobke | 2013-06-13 | 1 | -1/+1 |
| * | | TL;DR and remove link from "Report issue here" | Morris Jobke | 2013-06-12 | 1 | -1/+5 |
| * | | trashbin -> deleted files | Morris Jobke | 2013-06-05 | 1 | -1/+1 |
| * | | Revise Contributing document | Michael Gapczynski | 2013-06-03 | 1 | -8/+8 |
* | | | Merge pull request #3687 from owncloud/template_updates | Björn Schießle | 2013-06-13 | 9 | -18/+119 |
|\ \ \ | |||||
| * | | | improved footer | Björn Schießle | 2013-06-13 | 2 | -3/+8 |
| * | | | Merge branch 'template_updates' of github.com:owncloud/core into template_upd... | Björn Schießle | 2013-06-12 | 2 | -9/+4 |
| |\ \ \ | |||||
| | * | | | move common settings footer fieldset out of conditional | Jan-Christoph Borchardt | 2013-06-12 | 2 | -9/+4 |
| * | | | | add logo-claim | Björn Schießle | 2013-06-12 | 2 | -1/+6 |
| * | | | | don't show translation hints in enterprise edition | Björn Schießle | 2013-06-12 | 1 | -0/+2 |
| |/ / / | |||||
| * | | | short explanation about OC_Defaults | Björn Schießle | 2013-06-12 | 1 | -0/+5 |
| * | | | make pub link share footer aware of different owncloud editions | Björn Schießle | 2013-06-12 | 1 | -2/+2 |
| * | | | make main menu aware of the different owncloud editions | Björn Schießle | 2013-06-12 | 1 | -1/+2 |
| * | | | add default doc url | Björn Schießle | 2013-06-12 | 1 | -0/+10 |
| * | | | make footer and urls aware of ownCloud editions | Björn Schießle | 2013-06-12 | 4 | -5/+23 |
| * | | | keep all strings in one place to make it easier to change them | Björn Schießle | 2013-06-12 | 4 | -7/+55 |
| * | | | make footer aware of ownCloud editions | Björn Schießle | 2013-06-12 | 1 | -2/+7 |
| * | | | mage page title aware of ownCloud edition | Björn Schießle | 2013-06-12 | 3 | -4/+11 |
| | |/ | |/| | |||||
* | | | Merge pull request #3558 from owncloud/files_encryption_check_private_key | Björn Schießle | 2013-06-13 | 20 | -158/+460 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-13 | 583 | -3299/+6073 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #3552 from owncloud/files_encryption_upgrade_fix | Björn Schießle | 2013-06-13 | 8 | -99/+52 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into files_encryption_upgrade_fix | Björn Schießle | 2013-06-13 | 163 | -1726/+4352 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #3640 from infoneo/master | Thomas Müller | 2013-06-13 | 2 | -19/+31 |
|\ \ \ \ \ | |||||
| * | | | | | Update mapper.php | infoneo | 2013-06-08 | 1 | -3/+15 |
| * | | | | | Update mapper.php | infoneo | 2013-06-08 | 1 | -25/+8 |
| * | | | | | Fixed problems with a dots in a filenames | infoneo | 2013-05-12 | 1 | -6/+12 |
| * | | | | | Dots in a filenames fix | infoneo | 2013-05-12 | 1 | -8/+19 |
* | | | | | | Merge pull request #3668 from owncloud/encryption_migrate_only_once | Björn Schießle | 2013-06-13 | 3 | -28/+74 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add comment to explain the helper function | Björn Schießle | 2013-06-13 | 1 | -0/+8 |
| * | | | | | | fix typo in var name | Björn Schießle | 2013-06-13 | 1 | -1/+1 |
| * | | | | | | adapt test to the code changes | Björn Schießle | 2013-06-12 | 1 | -3/+18 |
| * | | | | | | use number of manipulated rows as idicator if it was possible to enter the mi... | Björn Schießle | 2013-06-12 | 2 | -69/+24 |
| * | | | | | | use constants for different migration status | Björn Schießle | 2013-06-11 | 1 | -8/+11 |
| * | | | | | | make sure that only one process can enter the migration mode | Björn Schießle | 2013-06-11 | 2 | -12/+77 |
* | | | | | | | Merge pull request #3677 from owncloud/apps-buttons | Jan-Christoph Borchardt | 2013-06-13 | 2 | -6/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | apps management: change misleading + to ... | Jan-Christoph Borchardt | 2013-06-12 | 1 | -1/+1 |
| * | | | | | | | remove App management top bar and move buttons more contextually in the inter... | Jan-Christoph Borchardt | 2013-06-12 | 2 | -6/+17 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-06-13 | 156 | -1673/+4230 |
| | | | * | | | Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into ... | Björn Schießle | 2013-06-13 | 1 | -0/+0 |
| | | | |\ \ \ | |||||
| | | | | * | | | update submodule | Florin Peter | 2013-06-12 | 1 | -0/+0 |
| | | | * | | | | LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed | Björn Schießle | 2013-06-13 | 1 | -18/+0 |
| | | | |/ / / | |||||
| | | | * | | | Merge branch 'master' into files_encryption_upgrade_fix | Björn Schießle | 2013-06-12 | 753 | -4945/+8757 |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | |