summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12299 from owncloud/clean-lib-base-configMorris Jobke2014-11-201-23/+29
|\ | | | | replace all static calls to OC_Config and OC_Preferences to calls to OCP...
| * replace double quotes with single quotesMorris Jobke2014-11-191-1/+1
| |
| * replace all static calls to OC_Config and OC_Preferences to calls to OCP\IConfigMorris Jobke2014-11-191-23/+29
| |
* | Merge pull request #12325 from owncloud/removeunneccessarylangLukas Reschke2014-11-2011-164/+0
|\ \ | | | | | | cleanup languages. closes #11274
| * | cleanup languages. closes #11274Volkan Gezer2014-11-2011-164/+0
| | |
* | | Merge pull request #12226 from owncloud/remove-phpassThomas Müller2014-11-202-5/+2
|\ \ \ | | | | | | | | Remove phpass and migrate to new Hasher interface
| * | | Remove phpass and migrate to new Hasher interfaceLukas Reschke2014-11-172-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR removes phpass and migrates to the new Hasher interface. Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt. Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
* | | | Merge pull request #12297 from owncloud/issue/10991-all-testcaseMorris Jobke2014-11-201-3/+0
|\ \ \ \ | |_|/ / |/| | | Issue/10991 all testcase
| * | | Use base class to reset the file mapperJoas Schilling2014-11-191-3/+0
| | |/ | |/|
* | | Merge pull request #12253 from owncloud/port-12154Vincent Petry2014-11-204-11/+47
|\ \ \ | | | | | | | | Port 12154
| * | | Add repair steps for legacy config filesLukas Reschke2014-11-182-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all ports from the trusted domains Conflicts: lib/private/repair.php lib/repair/repairconfig.php
| * | | Ignore port for trusted domainsLukas Reschke2014-11-182-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain) Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975. Conflicts: lib/private/request.php
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-204-2/+6
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-194-2/+6
| | |
* | | drop unneeded var_dump - fixes #9997Morris Jobke2014-11-181-1/+0
| | |
* | | Merge pull request #12261 from oparoz/patch-1Morris Jobke2014-11-181-1/+1
|\ \ \ | | | | | | | | Replace deprecated switches
| * | | Replace deprecated switchesOlivier Paroz2014-11-181-1/+1
| | | | | | | | | | | | | | | | Warning: -convert-to is deprecated. Use --convert-to instead. Warning: -outdir is deprecated. Use --outdir instead.
* | | | Merge pull request #12224 from owncloud/fix_12211Björn Schießle2014-11-181-9/+22
|\ \ \ \ | |/ / / |/| | | make sure that we don't find the wrong shares if a user and a group have the same ID
| * | | only users can have a display name different from the idBjoern Schiessle2014-11-181-1/+4
| | | |
| * | | make sure that we only find the shares from the correct share type if users ↵Bjoern Schiessle2014-11-181-2/+8
| | | | | | | | | | | | | | | | and groups with the same ID exists
| * | | make sure that we don't find the wrong shares if a user and a group have the ↵Bjoern Schiessle2014-11-181-6/+10
| |/ / | | | | | | | | | same ID
* | | Merge pull request #12259 from owncloud/app-enabled-plugin-appmanagerLukas Reschke2014-11-181-4/+4
|\ \ \ | | | | | | | | Fix type hinting for app manager
| * | | Fix type hinting for app managerRobin Appelman2014-11-181-4/+4
| |/ /
* | | Merge pull request #12242 from owncloud/fix-undefined-sizeLukas Reschke2014-11-181-1/+1
|\ \ \ | |/ / |/| | Check if the size field is available
| * | Check if the size field is availableLukas Reschke2014-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases the 'size' field is not available resulting in some PHP errors such as: ```json {"reqId":"03548fd9e3d3aca15a5796b3b35d7b9d","remoteAddr":"::1","app":"PHP","message":"Undefined index: size at \/Users\/lreschke\/Programming\/core\/lib\/private\/files\/fileinfo.php#125","level":3,"time":"2014-11-17T21:38:57+00:00"} ``` This can be experienced when creating a new empty file and deleting it right away, then when going to the trash bin this error is thrown.
* | | Merge pull request #12237 from owncloud/fix-12236Morris Jobke2014-11-181-5/+5
|\ \ \ | | | | | | | | Make declaration compatible
| * | | Make declaration compatibleLukas Reschke2014-11-171-5/+5
| |/ / | | | | | | | | | Fixes #12236
* | | Merge pull request #9962 from owncloud/app-group-enable-remoteLukas Reschke2014-11-181-0/+75
|\ \ \ | | | | | | | | Fix remote.php routes for apps that are enabled for specific groups
| * | | Add sabredav plugin to check if a user has access to an appRobin Appelman2014-11-171-0/+75
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-184-0/+8
| | | |
* | | | Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElseLukas Reschke2014-11-171-0/+3
|\ \ \ \ | |_|/ / |/| | | Move CSRF check
| * | | Move CSRF checkLukas Reschke2014-11-171-0/+3
| | |/ | |/| | | | | | | Because we're closing the session now before controllers are executed there are cases where we cannot write the session.
* | | Merge pull request #11741 from owncloud/delete_all_children_preview_2Vincent Petry2014-11-171-16/+94
|\ \ \ | | | | | | | | delete all children's previews when deleting a folder
| * | | delete all children's previews when deleting a folderGeorg Ehrke2014-10-301-16/+94
| | | | | | | | | | | | | | | | add phpdoc
* | | | Merge pull request #12218 from owncloud/issue/10991-fixesMorris Jobke2014-11-172-2/+12
|\ \ \ \ | |_|_|/ |/| | | Issue/10991 Make unit tests pass on windows
| * | | Make it possible to cleanPath() absolute Windows pathsJoas Schilling2014-11-171-2/+11
| | | |
| * | | Correctly close handle of directory when listing certificatesJoas Schilling2014-11-171-0/+1
| | | |
* | | | Merge pull request #12031 from owncloud/app-managerRobin Appelman2014-11-174-0/+211
|\ \ \ \ | |_|_|/ |/| | | Add \OC\App\Manager to handle enabling/disabling apps
| * | | Add \OC\App\Manager to handle enabling/disabling appsRobin Appelman2014-11-104-0/+211
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-1726-10/+62
| | | |
* | | | Merge pull request #12186 from owncloud/fix-12182Morris Jobke2014-11-153-13/+31
|\ \ \ \ | | | | | | | | | | eliminate OC_Template::printErrorPage in database classes, fixes #12182
| * | | | do not output DB information, and do not set headerArthur Schiwon2014-11-143-7/+28
| | | | |
| * | | | errors are already loggedArthur Schiwon2014-11-142-3/+0
| | | | |
| * | | | eliminate OC_Template::printErrorPage in database classes, fixes #12182Arthur Schiwon2014-11-143-7/+7
| | | | |
* | | | | Check if app is enabled for userLukas Reschke2014-11-151-0/+11
|/ / / / | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-144-0/+4
| | | |
* | | | Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroupMorris Jobke2014-11-131-0/+4
|\ \ \ \ | | | | | | | | | | cleanup group admin(s) on deleteGroup
| * | | | cleanup group admin(s) on deleteGroupmichag862014-10-081-0/+4
| | | | |
* | | | | Merge pull request #11956 from ↵Morris Jobke2014-11-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/remove-check-for-allow_user_to_change_display_name removal of wrong/double implemented check
| * | | | | removal of wrong/double implemented checkmichag862014-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Check already implemented in core/settings/ajax/changedisplayname.php