aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21741 from owncloud/l10n-improvementsThomas Müller2016-01-276-259/+629
|\
| * Move class to legacy folderJoas Schilling2016-01-261-0/+0
| * Add tests for findLanguage()Joas Schilling2016-01-261-7/+7
| * Add tests for the factoryJoas Schilling2016-01-261-8/+8
| * Fix the testsJoas Schilling2016-01-261-1/+1
| * Deprecate OC_L10N in favor of a namespaces and DI versionJoas Schilling2016-01-264-15/+229
| * Deprecate getFirstWeekDay() and getDateFormat() in favor of l()Joas Schilling2016-01-261-24/+10
| * Move finding the language files and creating the function out of the objectJoas Schilling2016-01-263-98/+129
| * Move validation and fallbacks of app and lang to the constructor/factoryJoas Schilling2016-01-262-14/+23
| * 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 #21887 from owncloud/share2_updateShareThomas Müller2016-01-272-15/+160
|\ \
| * | Fix comments from ThomasRoeland Jago Douma2016-01-262-16/+16
| * | [Share 2.0] Fire off hookRoeland Jago Douma2016-01-261-5/+21
| * | [Share 2.0] Add update shareRoeland Jago Douma2016-01-262-4/+133
| |/
* | Merge pull request #21906 from owncloud/querybuilder-clob-comparisonThomas Müller2016-01-274-48/+218
|\ \
| * | Move parameter to the right function callJoas Schilling2016-01-261-2/+1
| * | Use our OCP constantsJoas Schilling2016-01-261-3/+4
| * | Introduce helper methodJoas Schilling2016-01-261-99/+34
| * | Fix Oracle comparisonsJoas Schilling2016-01-263-39/+272
| * | Adjust comments to the new constantsJoas Schilling2016-01-263-3/+5
| |/
* | Merge pull request #21930 from owncloud/less-error-messagesThomas Müller2016-01-271-1/+3
|\ \
| * | Avoid error message in log during setup because of existing data dirMorris Jobke2016-01-261-1/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-2712-0/+14
|/ /
* | Merge pull request #21664 from owncloud/comments-davThomas Müller2016-01-262-3/+5
|\ \
| * | Comments DAV implementationArthur Schiwon2016-01-262-3/+5
| |/
* / We must resolve to the proper usergroup shareRoeland Jago Douma2016-01-261-3/+11
|/
* Merge pull request #21901 from owncloud/fix-setupThomas Müller2016-01-261-5/+8
|\
| * Fix setup pageMorris Jobke2016-01-261-5/+8
* | Merge pull request #21845 from owncloud/sync-system-addressbook-on-avatar-changeThomas Müller2016-01-263-19/+30
|\ \
| * | Trigger change on avatar deleteThomas Müller2016-01-251-0/+1
| * | Changing the avatar of the user emits the changeUser event which triggers upd...Thomas Müller2016-01-253-19/+29
* | | Merge pull request #21894 from owncloud/refactor-csrfThomas Müller2016-01-2611-70/+350
|\ \ \
| * | | Regenerate CSRF token upon loginLukas Reschke2016-01-251-0/+2
| * | | Add new CSRF manager for unit testing purposesLukas Reschke2016-01-2511-70/+348
* | | | [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
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
|\ \
| * | 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
|\ \ \
| * | | 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 interfaceMorris Jobke2016-01-244-30/+18
* | | | | remove unused variableMorris Jobke2016-01-251-1/+0
| |_|_|/ |/| | |