summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Move findLanguage() and setLanguageFromRequest() to factoryJoas Schilling2016-01-264-99/+163
|
* Move languageExists() to the factoryJoas Schilling2016-01-263-8/+27
|
* Move findAvailableLanguages() to the factoryJoas Schilling2016-01-263-19/+66
|
* Merge pull request #21901 from owncloud/fix-setupThomas Müller2016-01-261-5/+8
|\ | | | | Fix setup page
| * Fix setup pageMorris Jobke2016-01-261-5/+8
| | | | | | | | * fixes #21897
* | Merge pull request #21845 from owncloud/sync-system-addressbook-on-avatar-changeThomas Müller2016-01-263-19/+30
|\ \ | | | | | | Changing the avatar of the user emits the changeUser event which trig…
| * | Trigger change on avatar deleteThomas Müller2016-01-251-0/+1
| | |
| * | Changing the avatar of the user emits the changeUser event which triggers ↵Thomas Müller2016-01-253-19/+29
| | | | | | | | | | | | update of the system addressbook
* | | Merge pull request #21894 from owncloud/refactor-csrfThomas Müller2016-01-2611-70/+350
|\ \ \ | | | | | | | | Add new CSRF manager for unit testing purposes
| * | | Regenerate CSRF token upon loginLukas Reschke2016-01-251-0/+2
| | | | | | | | | | | | | | | | Otherwise somebody else might be able to note down the CSRF token before login on a shared computer.
| * | | Add new CSRF manager for unit testing purposesLukas Reschke2016-01-2511-70/+348
| | | | | | | | | | | | | | | | This adds a new CSRF manager for unit testing purposes, it's interface is based upon https://github.com/symfony/security-csrf. Due to some of our required custom changes it is however not possible to use the Symfony component directly.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-2678-80/+4
| | | |
* | | | Merge pull request #21892 from owncloud/issue-21890-parametersThomas Müller2016-01-257-18/+59
|\ \ \ \ | |_|/ / |/| | | Add parameters types to IQueryBuilder
| * | | Replace other usagesJoas Schilling2016-01-256-18/+20
| | | |
| * | | Add parameters to public interfaceJoas Schilling2016-01-251-0/+39
| | |/ | |/|
* / | Adding support of -1 as size to be passed into get and getFileThomas Müller2016-01-252-14/+14
|/ /
* | Merge pull request #21424 from owncloud/appversionsThomas Müller2016-01-252-21/+11
|\ \ | | | | | | Use appConfig to get app versions
| * | Faster AppConfig->getValuesRobin Appelman2016-01-111-7/+6
| | |
| * | Use appconfig for getAppVersionsRobin Appelman2016-01-111-14/+5
| | |
* | | Merge pull request #21806 from owncloud/mdusher-masterThomas Müller2016-01-251-3/+3
|\ \ \ | | | | | | | | [jenkins] Added ' to characters allowed in the username
| * | | fix error message and commentMorris Jobke2016-01-201-2/+2
| | | |
| * | | Added ' to characters allowed in the usernameMichael U2016-01-201-2/+2
| | | |
* | | | Merge pull request #21844 from owncloud/drop-image-pathThomas Müller2016-01-254-30/+18
|\ \ \ \ | | | | | | | | | | Remove OC_Helper::imagePath and use the proper public interface
| * | | | Remove OC_Helper::imagePath and use the proper public interfaceMorris Jobke2016-01-244-30/+18
| | | | |
* | | | | remove unused variableMorris Jobke2016-01-251-1/+0
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-252-4/+4
|/ / /
* | | Merge pull request #21841 from owncloud/share2_deletefromselfThomas Müller2016-01-223-0/+104
|\ \ \ | | | | | | | | [Share 2.0] Add deleteFromSelf method
| * | | [Share 2.0] Add deleteFromSelf methodRoeland Jago Douma2016-01-223-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows recipient to delete a share. For user shares this is the same as deleting (at least for now). But for group shares this means creating a new share with type 2. With permissions set to 0.
* | | | Merge pull request #21836 from RomanKreisel/masterThomas Müller2016-01-221-0/+5
|\ \ \ \ | | | | | | | | | | Solves #21835 (https://github.com/owncloud/core/issues/21835)
| * | | | Solves #Roman Kreisel2016-01-211-0/+5
| | | | |
* | | | | Merge pull request #21719 from owncloud/move-notification-api-to-ocpThomas Müller2016-01-2211-81/+75
|\ \ \ \ \ | |_|/ / / |/| | | | Move the notification API to public namespace
| * | | | Allow automatic injection of the ManagerJoas Schilling2016-01-222-1/+5
| | | | |
| * | | | Adjust the since on the interfaceJoas Schilling2016-01-225-48/+48
| | | | |
| * | | | Move the notification API to public namespaceJoas Schilling2016-01-2210-32/+22
| | | | |
* | | | | Merge pull request #18531 from owncloud/ext-user-credentialsThomas Müller2016-01-2213-47/+369
|\ \ \ \ \ | | | | | | | | | | | | External storage 'Login credentials' auth mechanism
| * | | | | allow comparing clob using expressionbuilder->eq if you explicitly say ↵Robin Appelman2016-01-185-6/+50
| | | | | | | | | | | | | | | | | | | | | | | | you're comparing strings
| * | | | | handle bool in setValueRobin Appelman2016-01-181-3/+13
| | | | | |
| * | | | | also handle not null violationsRobin Appelman2016-01-181-1/+1
| | | | | |
| * | | | | Introduce CredentialsManager for storage of credentials in DBRobin McCorkell2016-01-185-0/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CredentialsManager performs a simple role, of storing and retrieving encrypted credentials from the database. Credentials are stored by user ID (which may be null) and credentials identifier. Credentials themselves may be of any type that can be JSON encoded. The rationale behind this is to avoid further (mis)use of oc_preferences, which was being used for all manner of data not related to user preferences.
| * | | | | Introduce IDBConnection::setValues()Robin McCorkell2016-01-184-42/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setValues() attempts to insert a new row, or failing that, update an existing row. The ability to set preconditions is also available.
* | | | | | Merge pull request #21849 from owncloud/add-custom-marker-into-htaccessThomas Müller2016-01-224-4/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add custom marker into htaccess and execute integrity check after installation
| * | | | | | Exclude .htaccess modifications from code checkerLukas Reschke2016-01-224-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After the initial installation ownCloud will write some content into the .htaccess file such as the 404 or 403 directives. This adds a magic marker into the .htaccess file and only the content above this marker will be compared in the integrity checker.
* | | | | | | Merge pull request #21816 from ↵Thomas Müller2016-01-221-4/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | owncloud/require-a-specific-path-instead-of-autoguessing Use path instead of app id for occ app signing
| * | | | | | Use path instead of app idLukas Reschke2016-01-201-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change requires the usage of a path instead of the App ID when signing code. This has the advantage that developers can also sign code under a different location to make it easier. (e.g. remove `.git`, …) Also it adds an example command usage as well as a link to the documentation
* | | | | | | Merge pull request #20768 from owncloud/mount-cacheThomas Müller2016-01-229-20/+616
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | cache mountpoints in the db
| * | | | | | use insertifnotexistsRobin Appelman2016-01-201-23/+5
| | | | | | |
| * | | | | | clear mount cache when removing applicablesRobin Appelman2016-01-202-0/+36
| | | | | | |
| * | | | | | handle changed mount pointsRobin Appelman2016-01-201-1/+23
| | | | | | |
| * | | | | | clear mount cache when deleting userRobin Appelman2016-01-204-18/+101
| | | | | | |
| * | | | | | multiple minor fiesRobin Appelman2016-01-206-11/+36
| | | | | | |