summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14366 from owncloud/remove-old-l10n-filesLukas Reschke2015-02-1918-108/+0
|\
| * Remove some old l10n files they arent loaded anymoreJoas Schilling2015-02-1918-108/+0
* | Merge pull request #14199 from owncloud/cast-type-manuallyMorris Jobke2015-02-1947-131/+131
|\ \
| * | Use `int` instead of `string`Lukas Reschke2015-02-161-1/+1
| * | Do not change behaviour of 'false'Joas Schilling2015-02-131-2/+2
| * | This is an arrayLukas Reschke2015-02-131-1/+1
| * | Manually type-case all AJAX filesLukas Reschke2015-02-1347-133/+133
* | | Merge pull request #13505 from owncloud/streamline-scanning-codeThomas Müller2015-02-191-1/+5
|\ \ \
| * | | Streamline auth and CSRF check in scan.phpLukas Reschke2015-01-201-1/+5
* | | | Merge pull request #14267 from owncloud/encode-eventsourceThomas Müller2015-02-191-1/+1
|\ \ \ \
| * | | | Encode requesttokenLukas Reschke2015-02-161-1/+1
* | | | | Merge pull request #14295 from owncloud/encode-request-token-for-avatarsThomas Müller2015-02-191-2/+2
|\ \ \ \ \
| * | | | | Encode Requesttoken for avatarsLukas Reschke2015-02-171-2/+2
* | | | | | Merge pull request #14311 from raimund-schluessler/Fix#14310Thomas Müller2015-02-191-1/+1
|\ \ \ \ \ \
| * | | | | | Fix #14310Raimund Schlüßler2015-02-171-1/+1
* | | | | | | Merge pull request #14377 from owncloud/port-14041Thomas Müller2015-02-191-3/+37
|\ \ \ \ \ \ \
| * | | | | | | Port of #14041 to masterArthur Schiwon2015-02-191-3/+37
|/ / / / / / /
* | | | | | | Merge pull request #14338 from owncloud/fix-nav-heigtMorris Jobke2015-02-191-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | if no link text has been set for the navigation show the link nonethelessBernhard Posselt2015-02-181-0/+1
* | | | | | | Merge pull request #14342 from owncloud/disallow-path-traversals-in-file-viewThomas Müller2015-02-192-6/+149
|\ \ \ \ \ \ \
| * | | | | | | Add some basic PHPDoc to functionsLukas Reschke2015-02-181-6/+124
| * | | | | | | Prevent directory traversals in ctr of \OC\Files\ViewLukas Reschke2015-02-182-0/+25
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1944-170/+236
* | | | | | | | Merge pull request #13836 from owncloud/part-no-cache-updateThomas Müller2015-02-192-1/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Dont bother updating the cache when working with part filesRobin Appelman2015-02-051-0/+12
| * | | | | | | | Dont update the cache after fopenRobin Appelman2015-02-051-1/+1
* | | | | | | | | Merge pull request #14349 from owncloud/contributetrackerupdateThomas Müller2015-02-181-6/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add documentation issue trackers and use https everywhereVolkan Gezer2015-02-181-6/+10
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #12213 from sebomoto/add-loadfeedbackJan-Christoph Borchardt2015-02-183-1/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | changed image to classed div for spinner animationSebastian Bolt2015-02-043-1/+9
* | | | | | | | | Merge pull request #13989 from owncloud/enhancment/security/11857Clark Tomlinson2015-02-188-22/+529
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename to allowEvalLukas Reschke2015-02-162-3/+3
| * | | | | | | | | Allow AppFramework applications to specify a custom CSP headerLukas Reschke2015-02-168-22/+529
* | | | | | | | | | Merge pull request #14335 from owncloud/enable-strict-mode-per-deafultClark Tomlinson2015-02-181-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix invalid `ini_set` directivesLukas Reschke2015-02-181-2/+2
* | | | | | | | | | | Merge pull request #14330 from owncloud/revert-13879-add_debug_log_for_memcac...Lukas Reschke2015-02-183-21/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "add debug log for memcache instantiation"Lukas Reschke2015-02-183-21/+7
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #14324 from owncloud/fix/14320Clark Tomlinson2015-02-182-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Use the untrusted domain in the installerLukas Reschke2015-02-181-2/+2
| * | | | | | | | | | Check if instance is not yet installedLukas Reschke2015-02-181-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #14211 from owncloud/activity/225-files-extension-jenkinsVincent Petry2015-02-182-0/+285
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move displaying of files related activities to files appJoas Schilling2015-02-132-0/+285
* | | | | | | | | | | Merge pull request #14210 from owncloud/activity/225-sharing-extension-jenkinsVincent Petry2015-02-183-75/+156
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Use filterNotificationTypes to filter the types and group the methodsJoas Schilling2015-02-131-43/+37
| * | | | | | | | | | Copy sharing related activity code to Files_Sharing activity extensionJoas Schilling2015-02-133-49/+136
* | | | | | | | | | | Merge pull request #13857 from owncloud/phpseclib-0.3.9Thomas Müller2015-02-181-10/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update phpseclib to version 0.3.9.Andreas Fischer2015-02-181-10/+2
* | | | | | | | | | | | Merge pull request #14308 from owncloud/fix-14247Thomas Müller2015-02-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add mapping for a broken varchar type. Fixes #14247Victor Dubiniuk2015-02-171-0/+1
* | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-18134-222/+76
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 07:28:03 +0000