summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix undefined propertiesRobin Appelman2016-07-086-2/+23
* [tx-robot] updated from transifexNextcloud bot2016-07-0846-150/+200
* Merge pull request #314 from jernst/masterLukas Reschke2016-07-073-9/+51
|\
| * Extended documentation on trusted_domains to cover ports and wildcards.Johannes Ernst2016-07-071-0/+6
| * Disallow certain malformed domain names even if they match the trusted domain...Johannes Ernst2016-07-062-3/+10
| * Trusted domain wildcard checking made shorter, supporting multiple *Johannes Ernst2016-07-062-33/+34
| * Duh, no 'next' in PHP.Johannes Ernst2016-07-061-2/+2
| * Allow wildcard * to be used in trusted domains, to support setups where no re...Johannes Ernst2016-07-051-2/+30
* | Merge pull request #333 from nextcloud/sync-masterLukas Reschke2016-07-07158-603/+517
|\ \
| * | Simplify test code and don't show anything if no date is setMorris Jobke2016-07-072-10/+4
| * | add unit testsMorris Jobke2016-07-071-3/+40
| * | Update header during update callbackMorris Jobke2016-07-071-5/+5
| * | Not set expiration date is represented as 0Morris Jobke2016-07-071-1/+4
| * | add "Never" if expiration date is not setMorris Jobke2016-07-071-2/+3
| * | Add expiration date to share by link viewMorris Jobke2016-07-072-0/+41
| * | Change png icons to svgJuan Pablo Villafáñez2016-07-072-2/+2
| * | Revert "occ web executor (#24957)"Morris Jobke2016-07-077-324/+6
| * | Revert "Bypass upgrade page when occ controller is requested"Morris Jobke2016-07-071-15/+3
| * | Merge branch 'master' into sync-masterMorris Jobke2016-07-07811-3207/+9572
| |\ \
| * | | Revert "[tx-robot] updated from transifex"Morris Jobke2016-07-07158-1050/+86
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-0748-16/+324
| * | | Set content type when downloading log file to force download in some browsers...Vincent Petry2016-07-062-0/+4
| * | | Use named parameter instead of direct value for system tags search param (#25...Vincent Petry2016-07-061-1/+1
| * | | Merge pull request #25361 from owncloud/sharing-inttestforusershareaftergroup...Vincent Petry2016-07-061-0/+15
| |\ \ \
| | * | | Add integration test for sharing with group, then user in groupVincent Petry2016-07-051-0/+15
| * | | | Merge pull request #25325 from owncloud/filelist-prependslashVincent Petry2016-07-062-1/+10
| |\ \ \ \
| | * | | | Filelist change dir auto-prepend slashVincent Petry2016-07-012-1/+10
| * | | | | Ignore invalid paths in the JS file list (#25368)Vincent Petry2016-07-062-0/+39
| * | | | | Upgrading the log level From Debug to INFO to be consistent with files_trashb...Carlos Damken2016-07-061-3/+3
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-0632-24/+56
| * | | | | Merge pull request #25356 from owncloud/checkupgrade-bypassVincent Petry2016-07-051-3/+15
| |\ \ \ \ \
| | * | | | | Bypass upgrade page when occ controller is requestedVictor Dubiniuk2016-07-051-3/+15
| * | | | | | Merge pull request #25344 from owncloud/fix-ldap-check-userVincent Petry2016-07-051-0/+4
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | check if renamed user is still valid by reapplying the ldap filter (#25338)felixboehm2016-07-041-0/+4
| * | | | | | fix swift primary object store test (#25281)Thomas Müller2016-07-054-2/+59
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-0518-12/+160
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #25240 from owncloud/remove-svgMorris Jobke2016-07-04124-185/+56
| |\ \ \ \ \
| | * | | | | adjusts tests to removal of svg fallbackHendrik Leppelsack2016-07-011-38/+1
| | * | | | | remove svg classesHendrik Leppelsack2016-07-0115-35/+35
| | * | | | | remove png references in coreHendrik Leppelsack2016-07-013-18/+11
| | * | | | | remove png actions, fileicons, etcHendrik Leppelsack2016-07-01105-0/+0
| | * | | | | remove javascript png fallback for svgHendrik Leppelsack2016-07-011-94/+9
| * | | | | | Merge pull request #25253 from owncloud/users-fixotherquotadropdownVincent Petry2016-07-041-3/+15
| |\ \ \ \ \ \
| | * | | | | | Prevent negative or non-number values in quota inputVincent Petry2016-06-241-0/+6
| | * | | | | | Fix "Other" value handling in quota dropdown in users pageVincent Petry2016-06-231-3/+9
| * | | | | | | Merge pull request #25314 from owncloud/files_external-backends-configVincent Petry2016-07-041-3/+18
| |\ \ \ \ \ \ \
| | * | | | | | | show configuration options for authentication backends while listing storageRobin Appelman2016-06-301-0/+4
| | * | | | | | | hide hidden parameters from list backend/auth parametersRobin Appelman2016-06-301-3/+14
| * | | | | | | | Change nickvergessen mailmap entry (#25349)Joas Schilling2016-07-041-1/+2
| * | | | | | | | Cap LDAP user cache (#25323)Jörn Friedrich Dreyer2016-07-041-13/+15
| | |_|_|/ / / / | |/| | | | | |