Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-19 | 52 | -42/+350 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryptio... | Thomas Müller | 2015-04-18 | 3 | -7/+7 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix dummy encryption module registration | Joas Schilling | 2015-04-18 | 1 | -1/+1 | |
| * | | | | | | | Fix potential undefined variable | Joas Schilling | 2015-04-18 | 1 | -2/+2 | |
| * | | | | | | | Fix display name of encryption modules | Joas Schilling | 2015-04-18 | 1 | -4/+4 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #15728 from owncloud/update-iurlgenerator-doc | Thomas Müller | 2015-04-18 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | IUrlGenerator - document linkTo properly | Morris Jobke | 2015-04-18 | 1 | -1/+3 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #15727 from owncloud/cleanup-db-interface | Thomas Müller | 2015-04-18 | 6 | -26/+24 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix followup issues with unneeded parameters | Morris Jobke | 2015-04-18 | 5 | -20/+20 | |
| * | | | | | | | DB: remove unused parameter - was forgotten during the migration to doctrine | Morris Jobke | 2015-04-18 | 2 | -6/+4 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #15725 from owncloud/l10n-public-interface | Thomas Müller | 2015-04-18 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | IL10n - add PHPDoc for $options | Morris Jobke | 2015-04-18 | 1 | -2/+4 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #15722 from owncloud/remove-vardumps | Morris Jobke | 2015-04-18 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | LDAP tests: swithc var_dump to exception | Morris Jobke | 2015-04-18 | 1 | -3/+3 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #15723 from owncloud/fix-decimal-unit-tests | Morris Jobke | 2015-04-18 | 1 | -22/+24 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use data provider instead of hand-crafted for loops | Morris Jobke | 2015-04-18 | 1 | -22/+24 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #15720 from owncloud/fix-method-visibility | Thomas Müller | 2015-04-18 | 4 | -98/+98 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | fix wrong variable names in PHPDoc | Morris Jobke | 2015-04-18 | 2 | -4/+4 | |
| * | | | | | | add visibility of methods in server container and interface | Morris Jobke | 2015-04-18 | 2 | -94/+94 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #15692 from owncloud/log-exception-type-master | Joas Schilling | 2015-04-18 | 1 | -0/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Write the type of exception to the log - really helpful for exceptions which ... | Thomas Müller | 2015-04-17 | 1 | -0/+1 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-18 | 242 | -198/+692 | |
* | | | | | | Merge pull request #15714 from owncloud/fix-ldap-xpmode | Morris Jobke | 2015-04-18 | 3 | -2/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | always open filter tab in raw mode, when 'Manually enter LDAP filters' is che... | Arthur Schiwon | 2015-04-17 | 3 | -2/+8 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #15691 from owncloud/vobject-sabre2.1 | Morris Jobke | 2015-04-17 | 1 | -258/+0 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Get rid of the obsolete OC_VObject class | Vincent Petry | 2015-04-17 | 1 | -258/+0 | |
* | | | | | | | Merge pull request #15708 from owncloud/fix-capitalization | Morris Jobke | 2015-04-17 | 2 | -5/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix capitalization for server-side encryption and email server, fix #15642 | Jan-Christoph Borchardt | 2015-04-17 | 2 | -5/+5 | |
* | | | | | | | | Revert "make jshint happy" | Thomas Müller | 2015-04-17 | 2 | -20/+17 | |
* | | | | | | | | Revert "use a simple function - OC.Encryption is already defined - fixes #15707" | Thomas Müller | 2015-04-17 | 1 | -13/+23 | |
* | | | | | | | | make jshint happy | Thomas Müller | 2015-04-17 | 2 | -17/+20 | |
* | | | | | | | | use a simple function - OC.Encryption is already defined - fixes #15707 | Thomas Müller | 2015-04-17 | 1 | -23/+13 | |
* | | | | | | | | Merge pull request #15699 from owncloud/fix-15696-master | Thomas Müller | 2015-04-17 | 1 | -11/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Do not concat translation string | Thomas Müller | 2015-04-17 | 1 | -5/+4 | |
| * | | | | | | | | fixing undefined variable | Thomas Müller | 2015-04-17 | 1 | -8/+8 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #15695 from owncloud/handle-app-upgrade-of-filesystem-apps | Thomas Müller | 2015-04-17 | 2 | -19/+68 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Delay initialization of the OC\Encryption\Update - introducing 'OC\Encryption... | Thomas Müller | 2015-04-17 | 2 | -19/+68 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #15686 from owncloud/enc_fix_change_password | Thomas Müller | 2015-04-17 | 2 | -5/+38 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | fix change password if no user is logged in, occ call | Bjoern Schiessle | 2015-04-17 | 2 | -5/+38 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #15616 from owncloud/enc_stream_copy | Vincent Petry | 2015-04-17 | 6 | -60/+66 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | always create a new instance of the encryption module | Bjoern Schiessle | 2015-04-17 | 6 | -60/+66 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #15679 from owncloud/fix-private-member-access | Thomas Müller | 2015-04-17 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix private member access of parent class in ocsresponse | Morris Jobke | 2015-04-16 | 1 | -2/+2 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #15680 from owncloud/add-since-tags-to-public-namespace | Thomas Müller | 2015-04-17 | 141 | -152/+1373 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add @since tags to all methods in public namespace | Morris Jobke | 2015-04-16 | 141 | -152/+1373 | |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-17 | 42 | -68/+364 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #15675 from owncloud/enc_error_messages | Clark Tomlinson | 2015-04-16 | 6 | -10/+155 | |
|\ \ \ \ \ | ||||||
| * | | | | | display warning if password changed or if the keys are not initialized | Bjoern Schiessle | 2015-04-16 | 6 | -10/+155 | |
* | | | | | | Merge pull request #15445 from owncloud/enc2_migration | Clark Tomlinson | 2015-04-16 | 29 | -118/+1204 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | decrypt private key for public shares correctly | Bjoern Schiessle | 2015-04-16 | 3 | -4/+4 |